- * html/htmlparser.h (class KHTMLParser): keep "current" NodeImpl referenced
+ * html/htmlparser.h (class TDEHTMLParser): keep "current" NodeImpl referenced
to avoid ugly crashes when DHTML deletes the node while we're still parsing.
#57020, testcase alja.html
diff --git a/tdehtml/DESIGN.html b/tdehtml/DESIGN.html
index 861825141..3907a56d0 100644
--- a/tdehtml/DESIGN.html
+++ b/tdehtml/DESIGN.html
@@ -15,7 +15,7 @@ document, but it'll hopefully make it easier for you to read the source code.
The library is build up out of several different parts. Basically, when you use the lib, you
-create an instance of a KHTMLPart, and feed data to it. That's more or less all you need to
+create an instance of a TDEHTMLPart, and feed data to it. That's more or less all you need to
know if you want to use tdehtml for another application. If you want to start hacking tdehtml,
here's a sketch of the objects that will get constructed, when eg. running testtdehtml with
a url argument.
@@ -52,8 +52,8 @@ compatible to IE.
-KHTMLPart creates one instance of a
-KHTMLView (derived from TQScrollView),
+TDEHTMLPart creates one instance of a
+TDEHTMLView (derived from TQScrollView),
the widget showing the whole thing. At the same time a DOM tree
is built up from the HTML or XML found in the specified file.
@@ -173,7 +173,7 @@ classes. In the implementation classes we have added a few more intermediate cla
not be seen from the outside for various reasons (make implementation of shared features easier
or to reduce memory consumption).
-In C++, you can access the whole DOM tree from outside KHTML by using the interface classes.
+In C++, you can access the whole DOM tree from outside TDEHTML by using the interface classes.
For a description see the introduction to tdehtml on developer.kde.org.
One thing that has been omitted in the discussion above is the style sheet defined inside the
@@ -261,8 +261,8 @@ RenderRoot*
A call to of layout() on the
RenderRoot (the root of the rendering tree)
object causes the rendering tree to layout itself into the available space
-(width) given by the the KHTMLView. After that, the drawContents() method of
-KHTMLView can call RenderRoot->print() with appropriate parameters to actually
+(width) given by the the TDEHTMLView. After that, the drawContents() method of
+TDEHTMLView can call RenderRoot->print() with appropriate parameters to actually
paint the document. This is not 100% correct, when parsing incrementally, but
is exactly what happens when you resize the document.
@@ -301,7 +301,7 @@ the definition of the objects used in the rendering tree, the layouting code, an
Exception handling
To save on library size, C++-exceptions are only enabled in the dom/ subdirectory,
-since exceptions are mandated by the DOM API. In the rest of KHTML's code,
+since exceptions are mandated by the DOM API. In the rest of TDEHTML's code,
we pass an error flag (usually called "exceptionCode"), and the class that
is part of dom/* checks for this flag and throws the exception.
diff --git a/tdehtml/Mainpage.dox b/tdehtml/Mainpage.dox
index 84ebfedb1..5de4d53a2 100644
--- a/tdehtml/Mainpage.dox
+++ b/tdehtml/Mainpage.dox
@@ -1,19 +1,19 @@
/** @mainpage Trinity HTML Parser and Widget
If you want a fully-fledged HTML browser widget in your application,
-you can use KHTMLPart to do so.
+you can use TDEHTMLPart to do so.
@code
KUrl url = "http://www.trinitydesktop.org";
-KHTMLPart *w = new KHTMLPart();
+TDEHTMLPart *w = new TDEHTMLPart();
w->openUrl(url);
w->view()->resize(500, 400);
w->show();
@endcode
-For more information, see the documentation for KHTMLPart.
+For more information, see the documentation for TDEHTMLPart.
-Note that using KHTMLPart may introduce security vulnerabilities
+Note that using TDEHTMLPart may introduce security vulnerabilities
and unnecessary bloat to your application. Qt's text widgets are
rich-text capable, and will interpret a limited subset of HTML.
@@ -30,7 +30,7 @@ George Staikos \
Allan Sandfeld Jensen \
Germain Garand \
Maksim Orlovich \
-KHTML has also heavily benefited from the work of Apple Computer, Inc.
+TDEHTML has also heavily benefited from the work of Apple Computer, Inc.
@maintainers
Allan Sandfeld Jensen
Germain Garand
@@ -42,5 +42,5 @@ Maksim Orlovich
*/
// DOXYGEN_REFERENCES = tdecore tdeui kio tdeparts kjs
// DOXYGEN_EXCLUDE = test*.* html rendering xml misc ecma css imload pics test
-// DOXYGEN_SET_PROJECT_NAME = KHTML
+// DOXYGEN_SET_PROJECT_NAME = TDEHTML
// vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/tdehtml/README.HTMLWidget b/tdehtml/README.HTMLWidget
index 2a8900ee2..cae4a3c58 100644
--- a/tdehtml/README.HTMLWidget
+++ b/tdehtml/README.HTMLWidget
@@ -43,7 +43,7 @@ You can add the widget to your program by doing something like:
.
.
- KHTMLWidget *view = new KHTMLWidget( parent, "Name" );
+ TDEHTMLWidget *view = new TDEHTMLWidget( parent, "Name" );
view->show();
view->begin( "file:/tmp/test.html" );
diff --git a/tdehtml/css/css_renderstyledeclarationimpl.cpp b/tdehtml/css/css_renderstyledeclarationimpl.cpp
index 95c1c95d9..00e6f5382 100644
--- a/tdehtml/css/css_renderstyledeclarationimpl.cpp
+++ b/tdehtml/css/css_renderstyledeclarationimpl.cpp
@@ -41,8 +41,8 @@ static const int computedProperties[] = {
CSS_PROP_BACKGROUND_POSITION_Y,
CSS_PROP_BORDER_COLLAPSE,
CSS_PROP_BORDER_SPACING,
- CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING,
- CSS_PROP__KHTML_BORDER_VERTICAL_SPACING,
+ CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING,
+ CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING,
CSS_PROP_BORDER_TOP_COLOR,
CSS_PROP_BORDER_RIGHT_COLOR,
CSS_PROP_BORDER_BOTTOM_COLOR,
@@ -80,10 +80,10 @@ static const int computedProperties[] = {
CSS_PROP_MARGIN_RIGHT,
CSS_PROP_MARGIN_BOTTOM,
CSS_PROP_MARGIN_LEFT,
- CSS_PROP__KHTML_MARQUEE_DIRECTION,
- CSS_PROP__KHTML_MARQUEE_INCREMENT,
- CSS_PROP__KHTML_MARQUEE_REPETITION,
- CSS_PROP__KHTML_MARQUEE_STYLE,
+ CSS_PROP__TDEHTML_MARQUEE_DIRECTION,
+ CSS_PROP__TDEHTML_MARQUEE_INCREMENT,
+ CSS_PROP__TDEHTML_MARQUEE_REPETITION,
+ CSS_PROP__TDEHTML_MARQUEE_STYLE,
CSS_PROP_MAX_HEIGHT,
CSS_PROP_MAX_WIDTH,
CSS_PROP_MIN_HEIGHT,
@@ -137,7 +137,7 @@ static CSSValueImpl *valueForBorderStyle(EBorderStyle style)
{
switch (style) {
case tdehtml::BNATIVE:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_NATIVE);
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_NATIVE);
case tdehtml::BNONE:
return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
case tdehtml::BHIDDEN:
@@ -176,12 +176,12 @@ static CSSValueImpl *valueForTextAlign(ETextAlign align)
return new CSSPrimitiveValueImpl(CSS_VAL_CENTER);
case tdehtml::JUSTIFY:
return new CSSPrimitiveValueImpl(CSS_VAL_JUSTIFY);
- case tdehtml::KHTML_LEFT:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_LEFT);
- case tdehtml::KHTML_RIGHT:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_RIGHT);
- case tdehtml::KHTML_CENTER:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_CENTER);
+ case tdehtml::TDEHTML_LEFT:
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_LEFT);
+ case tdehtml::TDEHTML_RIGHT:
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_RIGHT);
+ case tdehtml::TDEHTML_CENTER:
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_CENTER);
}
Q_ASSERT( 0 );
return 0;
@@ -440,10 +440,10 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
"px");
return new CSSPrimitiveValueImpl(string, CSSPrimitiveValue::CSS_STRING);
}
- case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING:
+ case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING:
return new CSSPrimitiveValueImpl(style->borderHorizontalSpacing(),
CSSPrimitiveValue::CSS_PX);
- case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING:
+ case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING:
return new CSSPrimitiveValueImpl(style->borderVerticalSpacing(),
CSSPrimitiveValue::CSS_PX);
case CSS_PROP_BORDER_TOP_COLOR:
@@ -614,9 +614,9 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
case FRIGHT:
return new CSSPrimitiveValueImpl(CSS_VAL_RIGHT);
case FLEFT_ALIGN:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_LEFT);
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_LEFT);
case FRIGHT_ALIGN:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_RIGHT);
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_RIGHT);
}
}
case CSS_PROP_FONT_FAMILY:
@@ -706,10 +706,10 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
return valueForLength(style->marginBottom(), renderer->contentHeight());
case CSS_PROP_MARGIN_LEFT:
return valueForLength(style->marginLeft(), renderer->contentWidth());
- case CSS_PROP__KHTML_MARQUEE:
+ case CSS_PROP__TDEHTML_MARQUEE:
// FIXME: unimplemented
break;
- case CSS_PROP__KHTML_MARQUEE_DIRECTION:
+ case CSS_PROP__TDEHTML_MARQUEE_DIRECTION:
switch (style->marqueeDirection()) {
case MFORWARD:
return new CSSPrimitiveValueImpl(CSS_VAL_FORWARDS);
@@ -728,16 +728,16 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
}
Q_ASSERT(0);
return 0;
- case CSS_PROP__KHTML_MARQUEE_INCREMENT:
+ case CSS_PROP__TDEHTML_MARQUEE_INCREMENT:
return valueForLength(style->marqueeIncrement(), renderer->contentWidth());
- case CSS_PROP__KHTML_MARQUEE_REPETITION:
+ case CSS_PROP__TDEHTML_MARQUEE_REPETITION:
if (style->marqueeLoopCount() < 0)
return new CSSPrimitiveValueImpl(CSS_VAL_INFINITE);
return new CSSPrimitiveValueImpl(style->marqueeLoopCount(), CSSPrimitiveValue::CSS_NUMBER);
- case CSS_PROP__KHTML_MARQUEE_SPEED:
+ case CSS_PROP__TDEHTML_MARQUEE_SPEED:
// FIXME: unimplemented
break;
- case CSS_PROP__KHTML_MARQUEE_STYLE:
+ case CSS_PROP__TDEHTML_MARQUEE_STYLE:
switch (style->marqueeBehavior()) {
case MNONE:
return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
@@ -960,7 +960,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
case BOTTOM:
return new CSSPrimitiveValueImpl(CSS_VAL_BOTTOM);
case BASELINE_MIDDLE:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_BASELINE_MIDDLE);
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_BASELINE_MIDDLE);
case LENGTH:
return valueForLength(style->verticalAlignLength(), renderer->contentWidth());
}
@@ -991,8 +991,8 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
return new CSSPrimitiveValueImpl(CSS_VAL_PRE_LINE);
case NOWRAP:
return new CSSPrimitiveValueImpl(CSS_VAL_NOWRAP);
- case KHTML_NOWRAP:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_NOWRAP);
+ case TDEHTML_NOWRAP:
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_NOWRAP);
}
Q_ASSERT(0);
break;
@@ -1060,9 +1060,9 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
break;
case CSS_PROP_SCROLLBAR_ARROW_COLOR:
break;
- case CSS_PROP__KHTML_FLOW_MODE:
+ case CSS_PROP__TDEHTML_FLOW_MODE:
break;
- case CSS_PROP__KHTML_USER_INPUT:
+ case CSS_PROP__TDEHTML_USER_INPUT:
break;
default:
Q_ASSERT( 0 );
diff --git a/tdehtml/css/css_valueimpl.cpp b/tdehtml/css/css_valueimpl.cpp
index 0da65c4b6..94cca8840 100644
--- a/tdehtml/css/css_valueimpl.cpp
+++ b/tdehtml/css/css_valueimpl.cpp
@@ -891,7 +891,7 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string)
parsedFontName.replace(braceReg, TQString());
#ifndef APPLE_CHANGES
- const TQString &available = KHTMLSettings::availableFamilies();
+ const TQString &available = TDEHTMLSettings::availableFamilies();
parsedFontName = parsedFontName.lower();
// kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl;
diff --git a/tdehtml/css/csshelper.h b/tdehtml/css/csshelper.h
index 772a9eba1..5bc5194d0 100644
--- a/tdehtml/css/csshelper.h
+++ b/tdehtml/css/csshelper.h
@@ -28,7 +28,7 @@
#include "dom/dom_string.h"
class TQPaintDeviceMetrics;
-class KHTMLSettings;
+class TDEHTMLSettings;
namespace DOM
{
diff --git a/tdehtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp
index b994ad773..b33151b59 100644
--- a/tdehtml/css/cssparser.cpp
+++ b/tdehtml/css/cssparser.cpp
@@ -533,7 +533,7 @@ bool CSSParser::parseValue( int propId, bool important )
* correctly and allows optimization in tdehtml::applyRule(..)
*/
case CSS_PROP_CAPTION_SIDE: // top | bottom | left | right | inherit
- // Left and right were deprecated in CSS 2.1 and never supported by KHTML
+ // Left and right were deprecated in CSS 2.1 and never supported by TDEHTML
if ( /* id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || */
id == CSS_VAL_TOP || id == CSS_VAL_BOTTOM)
valid_primitive = true;
@@ -567,7 +567,7 @@ bool CSSParser::parseValue( int propId, bool important )
// upper-roman | lower-greek | lower-alpha | lower-latin | upper-alpha |
// upper-latin | hebrew | armenian | georgian | cjk-ideographic | hiragana |
// katakana | hiragana-iroha | katakana-iroha | none | inherit
- if ((id >= CSS_VAL_DISC && id <= CSS_VAL__KHTML_CLOSE_QUOTE) || id == CSS_VAL_NONE)
+ if ((id >= CSS_VAL_DISC && id <= CSS_VAL__TDEHTML_CLOSE_QUOTE) || id == CSS_VAL_NONE)
valid_primitive = true;
break;
@@ -590,8 +590,8 @@ bool CSSParser::parseValue( int propId, bool important )
break;
case CSS_PROP_FLOAT: // left | right | none | tdehtml_left | tdehtml_right | inherit + center for buggy CSS
- if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__KHTML_LEFT ||
- id == CSS_VAL__KHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
+ if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__TDEHTML_LEFT ||
+ id == CSS_VAL__TDEHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
valid_primitive = true;
break;
@@ -603,7 +603,7 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_TEXT_ALIGN:
// left | right | center | justify | tdehtml_left | tdehtml_right | tdehtml_center | | inherit
- if ( ( id >= CSS_VAL__KHTML_AUTO && id <= CSS_VAL__KHTML_CENTER ) ||
+ if ( ( id >= CSS_VAL__TDEHTML_AUTO && id <= CSS_VAL__TDEHTML_CENTER ) ||
value->unit == CSSPrimitiveValue::CSS_STRING )
valid_primitive = true;
break;
@@ -613,7 +613,7 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_BORDER_RIGHT_STYLE: // Defined as: none | hidden | dotted | dashed |
case CSS_PROP_BORDER_BOTTOM_STYLE: // solid | double | groove | ridge | inset | outset | -tdehtml-native
case CSS_PROP_BORDER_LEFT_STYLE: ////
- if (id >= CSS_VAL__KHTML_NATIVE && id <= CSS_VAL_DOUBLE)
+ if (id >= CSS_VAL__TDEHTML_NATIVE && id <= CSS_VAL_DOUBLE)
valid_primitive = true;
break;
@@ -636,8 +636,8 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_BORDER_SPACING:
{
- const int properties[2] = { CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING,
- CSS_PROP__KHTML_BORDER_VERTICAL_SPACING };
+ const int properties[2] = { CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING,
+ CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING };
if (num == 1) {
ShorthandScope scope(this, CSS_PROP_BORDER_SPACING);
if (!parseValue(properties[0], important)) return false;
@@ -653,8 +653,8 @@ bool CSSParser::parseValue( int propId, bool important )
}
return false;
}
- case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING:
- case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING:
+ case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING:
+ case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING:
valid_primitive = validUnit(value, FLength|FNonNeg, strict&(!nonCSSHint));
break;
@@ -682,10 +682,10 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_BORDER_BOTTOM_COLOR: // | inherit
case CSS_PROP_BORDER_LEFT_COLOR: // | inherit
case CSS_PROP_COLOR: // | inherit
- if ( id == CSS_VAL__KHTML_TEXT || id == CSS_VAL_MENU ||
+ if ( id == CSS_VAL__TDEHTML_TEXT || id == CSS_VAL_MENU ||
(id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT ) ||
id == CSS_VAL_TRANSPARENT ||
- (id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && (nonCSSHint|!strict) ) ) {
+ (id >= CSS_VAL_GREY && id < CSS_VAL__TDEHTML_TEXT && (nonCSSHint|!strict) ) ) {
valid_primitive = true;
} else {
parsedValue = parseColor();
@@ -707,13 +707,13 @@ bool CSSParser::parseValue( int propId, bool important )
break;
case CSS_PROP_BACKGROUND_ATTACHMENT:
- case CSS_PROP__KHTML_BACKGROUND_CLIP:
+ case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
case CSS_PROP_BACKGROUND_IMAGE:
- case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
+ case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
case CSS_PROP_BACKGROUND_POSITION:
case CSS_PROP_BACKGROUND_POSITION_X:
case CSS_PROP_BACKGROUND_POSITION_Y:
- case CSS_PROP__KHTML_BACKGROUND_SIZE:
+ case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
case CSS_PROP_BACKGROUND_REPEAT: {
CSSValueImpl *val1 = 0, *val2 = 0;
int propId1, propId2;
@@ -769,7 +769,7 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_PADDING_RIGHT: // | inherit
case CSS_PROP_PADDING_BOTTOM: // Which is defined as
case CSS_PROP_PADDING_LEFT: // |
- case CSS_PROP__KHTML_PADDING_START:
+ case CSS_PROP__TDEHTML_PADDING_START:
valid_primitive = ( !id && validUnit( value, FLength|FPercent|FNonNeg, strict&(!nonCSSHint) ) );
break;
@@ -807,7 +807,7 @@ bool CSSParser::parseValue( int propId, bool important )
// baseline | sub | super | top | text-top | middle | bottom | text-bottom |
// | | inherit
- if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__KHTML_BASELINE_MIDDLE )
+ if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__TDEHTML_BASELINE_MIDDLE )
valid_primitive = true;
else
valid_primitive = ( !id && validUnit( value, FLength|FPercent, strict&(!nonCSSHint) ) );
@@ -830,7 +830,7 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_MARGIN_RIGHT: // Which is defined as
case CSS_PROP_MARGIN_BOTTOM: // | | auto | inherit
case CSS_PROP_MARGIN_LEFT: ////
- case CSS_PROP__KHTML_MARGIN_START:
+ case CSS_PROP__TDEHTML_MARGIN_START:
if ( id == CSS_VAL_AUTO )
valid_primitive = true;
else
@@ -912,8 +912,8 @@ bool CSSParser::parseValue( int propId, bool important )
valid_primitive = true;
break;
- case CSS_PROP__KHTML_FLOW_MODE:
- if ( id == CSS_VAL__KHTML_NORMAL || id == CSS_VAL__KHTML_AROUND_FLOATS )
+ case CSS_PROP__TDEHTML_FLOW_MODE:
+ if ( id == CSS_VAL__TDEHTML_NORMAL || id == CSS_VAL__TDEHTML_AROUND_FLOATS )
valid_primitive = true;
break;
@@ -934,41 +934,41 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_OPACITY:
valid_primitive = validUnit(value, FNumber, strict);
break;
- case CSS_PROP__KHTML_USER_INPUT: // none | enabled | disabled | inherit
+ case CSS_PROP__TDEHTML_USER_INPUT: // none | enabled | disabled | inherit
if ( id == CSS_VAL_NONE || id == CSS_VAL_ENABLED || id == CSS_VAL_DISABLED )
valid_primitive = true;
-// kdDebug(6080) << "CSS_PROP__KHTML_USER_INPUT: " << valid_primitive << endl;
+// kdDebug(6080) << "CSS_PROP__TDEHTML_USER_INPUT: " << valid_primitive << endl;
break;
- case CSS_PROP__KHTML_MARQUEE: {
- const int properties[5] = { CSS_PROP__KHTML_MARQUEE_DIRECTION, CSS_PROP__KHTML_MARQUEE_INCREMENT,
- CSS_PROP__KHTML_MARQUEE_REPETITION,
- CSS_PROP__KHTML_MARQUEE_STYLE, CSS_PROP__KHTML_MARQUEE_SPEED };
+ case CSS_PROP__TDEHTML_MARQUEE: {
+ const int properties[5] = { CSS_PROP__TDEHTML_MARQUEE_DIRECTION, CSS_PROP__TDEHTML_MARQUEE_INCREMENT,
+ CSS_PROP__TDEHTML_MARQUEE_REPETITION,
+ CSS_PROP__TDEHTML_MARQUEE_STYLE, CSS_PROP__TDEHTML_MARQUEE_SPEED };
return parseShortHand(propId, properties, 5, important);
}
- case CSS_PROP__KHTML_MARQUEE_DIRECTION:
+ case CSS_PROP__TDEHTML_MARQUEE_DIRECTION:
if (id == CSS_VAL_FORWARDS || id == CSS_VAL_BACKWARDS || id == CSS_VAL_AHEAD ||
id == CSS_VAL_REVERSE || id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL_DOWN ||
id == CSS_VAL_UP || id == CSS_VAL_AUTO)
valid_primitive = true;
break;
- case CSS_PROP__KHTML_MARQUEE_INCREMENT:
+ case CSS_PROP__TDEHTML_MARQUEE_INCREMENT:
if (id == CSS_VAL_SMALL || id == CSS_VAL_LARGE || id == CSS_VAL_MEDIUM)
valid_primitive = true;
else
valid_primitive = validUnit(value, FLength|FPercent, strict&(!nonCSSHint));
break;
- case CSS_PROP__KHTML_MARQUEE_STYLE:
+ case CSS_PROP__TDEHTML_MARQUEE_STYLE:
if (id == CSS_VAL_NONE || id == CSS_VAL_SLIDE || id == CSS_VAL_SCROLL || id == CSS_VAL_ALTERNATE ||
id == CSS_VAL_UNFURL)
valid_primitive = true;
break;
- case CSS_PROP__KHTML_MARQUEE_REPETITION:
+ case CSS_PROP__TDEHTML_MARQUEE_REPETITION:
if (id == CSS_VAL_INFINITE)
valid_primitive = true;
else
valid_primitive = validUnit(value, FInteger|FNonNeg, strict&(!nonCSSHint));
break;
- case CSS_PROP__KHTML_MARQUEE_SPEED:
+ case CSS_PROP__TDEHTML_MARQUEE_SPEED:
if (id == CSS_VAL_NORMAL || id == CSS_VAL_SLOW || id == CSS_VAL_FAST)
valid_primitive = true;
else
@@ -1137,11 +1137,11 @@ bool CSSParser::parseBackgroundShorthand(bool important)
{
// Position must come before color in this array because a plain old "0" is a legal color
// in quirks mode but it's usually the X coordinate of a position.
- // FIXME: Add CSS_PROP__KHTML_BACKGROUND_SIZE to the shorthand.
+ // FIXME: Add CSS_PROP__TDEHTML_BACKGROUND_SIZE to the shorthand.
const int numProperties = 7;
const int properties[numProperties] = { CSS_PROP_BACKGROUND_IMAGE, CSS_PROP_BACKGROUND_REPEAT,
- CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION, CSS_PROP__KHTML_BACKGROUND_CLIP,
- CSS_PROP__KHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR };
+ CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION, CSS_PROP__TDEHTML_BACKGROUND_CLIP,
+ CSS_PROP__TDEHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR };
ShorthandScope scope(this, CSS_PROP_BACKGROUND);
@@ -1427,7 +1427,7 @@ CSSValueImpl* CSSParser::parseCounterContent(ValueList *args, bool counters)
if (i->unit != Value::Operator || i->iValue != ',') goto invalid;
i = args->next();
if (i->unit != CSSPrimitiveValue::CSS_IDENT) goto invalid;
- if (i->id < CSS_VAL_DISC || i->id > CSS_VAL__KHTML_CLOSE_QUOTE) goto invalid;
+ if (i->id < CSS_VAL_DISC || i->id > CSS_VAL__TDEHTML_CLOSE_QUOTE) goto invalid;
counter->m_listStyle = i->id - CSS_VAL_DISC;
}
return new CSSPrimitiveValueImpl(counter);
@@ -1439,9 +1439,9 @@ invalid:
CSSValueImpl* CSSParser::parseBackgroundColor()
{
int id = valueList->current()->id;
- if (id == CSS_VAL__KHTML_TEXT || id == CSS_VAL_TRANSPARENT ||
+ if (id == CSS_VAL__TDEHTML_TEXT || id == CSS_VAL_TRANSPARENT ||
(id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT) || id == CSS_VAL_MENU ||
- (id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && !strict))
+ (id >= CSS_VAL_GREY && id < CSS_VAL__TDEHTML_TEXT && !strict))
return new CSSPrimitiveValueImpl(id);
return parseColor();
}
@@ -1615,8 +1615,8 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2,
if (currValue)
valueList->next();
break;
- case CSS_PROP__KHTML_BACKGROUND_CLIP:
- case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
+ case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
+ case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
if (val->id == CSS_VAL_BORDER || val->id == CSS_VAL_PADDING || val->id == CSS_VAL_CONTENT) {
currValue = new CSSPrimitiveValueImpl(val->id);
valueList->next();
@@ -1646,7 +1646,7 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2,
valueList->next();
}
break;
- case CSS_PROP__KHTML_BACKGROUND_SIZE:
+ case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
currValue = parseBackgroundSize();
if (currValue)
valueList->next();
@@ -2268,7 +2268,7 @@ bool CSSParser::parseShadow(int propId, bool important)
// The only other type of value that's ok is a color value.
CSSPrimitiveValueImpl* parsedColor = 0;
bool isColor = (val->id >= CSS_VAL_AQUA && val->id <= CSS_VAL_WINDOWTEXT || val->id == CSS_VAL_MENU ||
- (val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__KHTML_TEXT && !strict));
+ (val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__TDEHTML_TEXT && !strict));
if (!context.allowColor)
return context.failed();
diff --git a/tdehtml/css/cssproperties.c b/tdehtml/css/cssproperties.c
index da5208412..384982aba 100644
--- a/tdehtml/css/cssproperties.c
+++ b/tdehtml/css/cssproperties.c
@@ -295,7 +295,7 @@ findProp (register const char *str, register unsigned int len)
#line 104 "cssproperties.gperf"
{"text-indent", CSS_PROP_TEXT_INDENT},
#line 69 "cssproperties.gperf"
- {"-tdehtml-margin-start", CSS_PROP__KHTML_MARGIN_START},
+ {"-tdehtml-margin-start", CSS_PROP__TDEHTML_MARGIN_START},
#line 14 "cssproperties.gperf"
{"background-color", CSS_PROP_BACKGROUND_COLOR},
#line 100 "cssproperties.gperf"
@@ -305,7 +305,7 @@ findProp (register const char *str, register unsigned int len)
#line 47 "cssproperties.gperf"
{"counter-reset", CSS_PROP_COUNTER_RESET},
#line 93 "cssproperties.gperf"
- {"-tdehtml-padding-start", CSS_PROP__KHTML_PADDING_START},
+ {"-tdehtml-padding-start", CSS_PROP__TDEHTML_PADDING_START},
#line 15 "cssproperties.gperf"
{"background-image", CSS_PROP_BACKGROUND_IMAGE},
#line 96 "cssproperties.gperf"
@@ -319,11 +319,11 @@ findProp (register const char *str, register unsigned int len)
#line 52 "cssproperties.gperf"
{"float", CSS_PROP_FLOAT},
#line 21 "cssproperties.gperf"
- {"-tdehtml-background-clip", CSS_PROP__KHTML_BACKGROUND_CLIP},
+ {"-tdehtml-background-clip", CSS_PROP__TDEHTML_BACKGROUND_CLIP},
#line 70 "cssproperties.gperf"
- {"-tdehtml-marquee", CSS_PROP__KHTML_MARQUEE},
+ {"-tdehtml-marquee", CSS_PROP__TDEHTML_MARQUEE},
#line 27 "cssproperties.gperf"
- {"-tdehtml-border-vertical-spacing", CSS_PROP__KHTML_BORDER_VERTICAL_SPACING},
+ {"-tdehtml-border-vertical-spacing", CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING},
#line 46 "cssproperties.gperf"
{"counter-increment", CSS_PROP_COUNTER_INCREMENT},
#line 128 "cssproperties.gperf"
@@ -337,7 +337,7 @@ findProp (register const char *str, register unsigned int len)
#line 31 "cssproperties.gperf"
{"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},
#line 22 "cssproperties.gperf"
- {"-tdehtml-background-origin", CSS_PROP__KHTML_BACKGROUND_ORIGIN},
+ {"-tdehtml-background-origin", CSS_PROP__TDEHTML_BACKGROUND_ORIGIN},
#line 17 "cssproperties.gperf"
{"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT},
#line 126 "cssproperties.gperf"
@@ -353,7 +353,7 @@ findProp (register const char *str, register unsigned int len)
#line 68 "cssproperties.gperf"
{"margin-left", CSS_PROP_MARGIN_LEFT},
#line 142 "cssproperties.gperf"
- {"-tdehtml-user-input", CSS_PROP__KHTML_USER_INPUT},
+ {"-tdehtml-user-input", CSS_PROP__TDEHTML_USER_INPUT},
#line 79 "cssproperties.gperf"
{"min-width", CSS_PROP_MIN_WIDTH},
#line 127 "cssproperties.gperf"
@@ -361,13 +361,13 @@ findProp (register const char *str, register unsigned int len)
#line 92 "cssproperties.gperf"
{"padding-left", CSS_PROP_PADDING_LEFT},
#line 71 "cssproperties.gperf"
- {"-tdehtml-marquee-direction", CSS_PROP__KHTML_MARQUEE_DIRECTION},
+ {"-tdehtml-marquee-direction", CSS_PROP__TDEHTML_MARQUEE_DIRECTION},
#line 73 "cssproperties.gperf"
- {"-tdehtml-marquee-repetition", CSS_PROP__KHTML_MARQUEE_REPETITION},
+ {"-tdehtml-marquee-repetition", CSS_PROP__TDEHTML_MARQUEE_REPETITION},
#line 95 "cssproperties.gperf"
{"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE},
#line 74 "cssproperties.gperf"
- {"-tdehtml-marquee-speed", CSS_PROP__KHTML_MARQUEE_SPEED},
+ {"-tdehtml-marquee-speed", CSS_PROP__TDEHTML_MARQUEE_SPEED},
#line 94 "cssproperties.gperf"
{"page-break-after", CSS_PROP_PAGE_BREAK_AFTER},
#line 81 "cssproperties.gperf"
@@ -383,7 +383,7 @@ findProp (register const char *str, register unsigned int len)
#line 134 "cssproperties.gperf"
{"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},
#line 72 "cssproperties.gperf"
- {"-tdehtml-marquee-increment", CSS_PROP__KHTML_MARQUEE_INCREMENT},
+ {"-tdehtml-marquee-increment", CSS_PROP__TDEHTML_MARQUEE_INCREMENT},
#line 116 "cssproperties.gperf"
{"word-spacing", CSS_PROP_WORD_SPACING},
#line 111 "cssproperties.gperf"
@@ -405,13 +405,13 @@ findProp (register const char *str, register unsigned int len)
#line 32 "cssproperties.gperf"
{"border-top-style", CSS_PROP_BORDER_TOP_STYLE},
#line 26 "cssproperties.gperf"
- {"-tdehtml-border-horizontal-spacing", CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING},
+ {"-tdehtml-border-horizontal-spacing", CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING},
#line 33 "cssproperties.gperf"
{"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE},
#line 34 "cssproperties.gperf"
{"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE},
#line 23 "cssproperties.gperf"
- {"-tdehtml-background-size", CSS_PROP__KHTML_BACKGROUND_SIZE},
+ {"-tdehtml-background-size", CSS_PROP__TDEHTML_BACKGROUND_SIZE},
#line 135 "cssproperties.gperf"
{"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR},
#line 129 "cssproperties.gperf"
@@ -435,7 +435,7 @@ findProp (register const char *str, register unsigned int len)
#line 84 "cssproperties.gperf"
{"outline-style", CSS_PROP_OUTLINE_STYLE},
#line 141 "cssproperties.gperf"
- {"-tdehtml-flow-mode", CSS_PROP__KHTML_FLOW_MODE},
+ {"-tdehtml-flow-mode", CSS_PROP__TDEHTML_FLOW_MODE},
#line 87 "cssproperties.gperf"
{"overflow-x", CSS_PROP_OVERFLOW_X},
#line 113 "cssproperties.gperf"
@@ -449,7 +449,7 @@ findProp (register const char *str, register unsigned int len)
#line 83 "cssproperties.gperf"
{"outline-offset", CSS_PROP_OUTLINE_OFFSET},
#line 75 "cssproperties.gperf"
- {"-tdehtml-marquee-style", CSS_PROP__KHTML_MARQUEE_STYLE},
+ {"-tdehtml-marquee-style", CSS_PROP__TDEHTML_MARQUEE_STYLE},
#line 55 "cssproperties.gperf"
{"font-style", CSS_PROP_FONT_STYLE},
#line 35 "cssproperties.gperf"
diff --git a/tdehtml/css/cssproperties.h b/tdehtml/css/cssproperties.h
index be92d93d4..c06431c62 100644
--- a/tdehtml/css/cssproperties.h
+++ b/tdehtml/css/cssproperties.h
@@ -15,13 +15,13 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
#define CSS_PROP_BACKGROUND_POSITION 5
#define CSS_PROP_BACKGROUND_POSITION_X 6
#define CSS_PROP_BACKGROUND_POSITION_Y 7
-#define CSS_PROP__KHTML_BACKGROUND_CLIP 8
-#define CSS_PROP__KHTML_BACKGROUND_ORIGIN 9
-#define CSS_PROP__KHTML_BACKGROUND_SIZE 10
+#define CSS_PROP__TDEHTML_BACKGROUND_CLIP 8
+#define CSS_PROP__TDEHTML_BACKGROUND_ORIGIN 9
+#define CSS_PROP__TDEHTML_BACKGROUND_SIZE 10
#define CSS_PROP_BORDER_COLLAPSE 11
#define CSS_PROP_BORDER_SPACING 12
-#define CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING 13
-#define CSS_PROP__KHTML_BORDER_VERTICAL_SPACING 14
+#define CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING 13
+#define CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING 14
#define CSS_PROP_BORDER_TOP_COLOR 15
#define CSS_PROP_BORDER_RIGHT_COLOR 16
#define CSS_PROP_BORDER_BOTTOM_COLOR 17
@@ -63,13 +63,13 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
#define CSS_PROP_MARGIN_RIGHT 53
#define CSS_PROP_MARGIN_BOTTOM 54
#define CSS_PROP_MARGIN_LEFT 55
-#define CSS_PROP__KHTML_MARGIN_START 56
-#define CSS_PROP__KHTML_MARQUEE 57
-#define CSS_PROP__KHTML_MARQUEE_DIRECTION 58
-#define CSS_PROP__KHTML_MARQUEE_INCREMENT 59
-#define CSS_PROP__KHTML_MARQUEE_REPETITION 60
-#define CSS_PROP__KHTML_MARQUEE_SPEED 61
-#define CSS_PROP__KHTML_MARQUEE_STYLE 62
+#define CSS_PROP__TDEHTML_MARGIN_START 56
+#define CSS_PROP__TDEHTML_MARQUEE 57
+#define CSS_PROP__TDEHTML_MARQUEE_DIRECTION 58
+#define CSS_PROP__TDEHTML_MARQUEE_INCREMENT 59
+#define CSS_PROP__TDEHTML_MARQUEE_REPETITION 60
+#define CSS_PROP__TDEHTML_MARQUEE_SPEED 61
+#define CSS_PROP__TDEHTML_MARQUEE_STYLE 62
#define CSS_PROP_MAX_HEIGHT 63
#define CSS_PROP_MAX_WIDTH 64
#define CSS_PROP_MIN_HEIGHT 65
@@ -87,7 +87,7 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
#define CSS_PROP_PADDING_RIGHT 77
#define CSS_PROP_PADDING_BOTTOM 78
#define CSS_PROP_PADDING_LEFT 79
-#define CSS_PROP__KHTML_PADDING_START 80
+#define CSS_PROP__TDEHTML_PADDING_START 80
#define CSS_PROP_PAGE_BREAK_AFTER 81
#define CSS_PROP_PAGE_BREAK_BEFORE 82
#define CSS_PROP_PAGE_BREAK_INSIDE 83
@@ -135,8 +135,8 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
#define CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR 125
#define CSS_PROP_SCROLLBAR_TRACK_COLOR 126
#define CSS_PROP_SCROLLBAR_ARROW_COLOR 127
-#define CSS_PROP__KHTML_FLOW_MODE 128
-#define CSS_PROP__KHTML_USER_INPUT 129
+#define CSS_PROP__TDEHTML_FLOW_MODE 128
+#define CSS_PROP__TDEHTML_USER_INPUT 129
#define CSS_PROP_MAX CSS_PROP_Z_INDEX
#define CSS_PROP_TOTAL 130
diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp
index 04b66e40a..2a1fb5477 100644
--- a/tdehtml/css/cssstyleselector.cpp
+++ b/tdehtml/css/cssstyleselector.cpp
@@ -211,7 +211,7 @@ static PseudoState pseudoState;
CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet, StyleSheetListImpl *styleSheets,
const KURL &url, bool _strictParsing )
{
- KHTMLView* view = doc->view();
+ TDEHTMLView* view = doc->view();
init(view ? view->part()->settings() : 0, doc);
@@ -273,14 +273,14 @@ CSSStyleSelector::CSSStyleSelector( CSSStyleSheetImpl *sheet )
{
init(0L, 0L);
- KHTMLView *view = sheet->doc()->view();
+ TDEHTMLView *view = sheet->doc()->view();
m_medium = view ? view->mediaType() : "screen";
authorStyle = new CSSStyleSelectorList();
authorStyle->append( sheet, m_medium );
}
-void CSSStyleSelector::init(const KHTMLSettings* _settings, DocumentImpl* doc)
+void CSSStyleSelector::init(const TDEHTMLSettings* _settings, DocumentImpl* doc)
{
element = 0;
settings = _settings;
@@ -308,12 +308,12 @@ CSSStyleSelector::~CSSStyleSelector()
void CSSStyleSelector::addSheet( CSSStyleSheetImpl *sheet )
{
- KHTMLView *view = sheet->doc()->view();
+ TDEHTMLView *view = sheet->doc()->view();
m_medium = view ? view->mediaType() : "screen";
authorStyle->append( sheet, m_medium );
}
-void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *doc)
+void CSSStyleSelector::loadDefaultStyle(const TDEHTMLSettings *s, DocumentImpl *doc)
{
if(s_defaultStyle) return;
@@ -883,9 +883,9 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
cleanpath( u );
}
//completeURL( attr.string() );
- bool contains = KHTMLFactory::vLinks()->contains( u );
+ bool contains = TDEHTMLFactory::vLinks()->contains( u );
if ( !contains && u.contains('/')==2 )
- contains = KHTMLFactory::vLinks()->contains( u+'/' );
+ contains = TDEHTMLFactory::vLinks()->contains( u+'/' );
return contains ? PseudoVisited : PseudoLink;
}
@@ -2136,9 +2136,9 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
(!parentNode && value->cssValueType() == CSSValue::CSS_INHERIT);
// These properties are used to set the correct margins/padding on RTL lists.
- if (id == CSS_PROP__KHTML_MARGIN_START)
+ if (id == CSS_PROP__TDEHTML_MARGIN_START)
id = style->direction() == LTR ? CSS_PROP_MARGIN_LEFT : CSS_PROP_MARGIN_RIGHT;
- else if (id == CSS_PROP__KHTML_PADDING_START)
+ else if (id == CSS_PROP__TDEHTML_PADDING_START)
id = style->direction() == LTR ? CSS_PROP_PADDING_LEFT : CSS_PROP_PADDING_RIGHT;
// What follows is a list that maps the CSS properties into their corresponding front-end
@@ -2150,16 +2150,16 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
case CSS_PROP_BACKGROUND_ATTACHMENT:
HANDLE_BACKGROUND_VALUE(backgroundAttachment, BackgroundAttachment, value)
break;
- case CSS_PROP__KHTML_BACKGROUND_CLIP:
+ case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
HANDLE_BACKGROUND_VALUE(backgroundClip, BackgroundClip, value)
break;
- case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
+ case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
HANDLE_BACKGROUND_VALUE(backgroundOrigin, BackgroundOrigin, value)
break;
case CSS_PROP_BACKGROUND_REPEAT:
HANDLE_BACKGROUND_VALUE(backgroundRepeat, BackgroundRepeat, value)
break;
- case CSS_PROP__KHTML_BACKGROUND_SIZE:
+ case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
HANDLE_BACKGROUND_VALUE(backgroundSize, BackgroundSize, value)
break;
case CSS_PROP_BORDER_COLLAPSE:
@@ -2181,27 +2181,27 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
case CSS_PROP_BORDER_TOP_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderTopStyle, BorderTopStyle, BorderStyle)
if (!primitiveValue) return;
- style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+ style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_BORDER_RIGHT_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderRightStyle, BorderRightStyle, BorderStyle)
if (!primitiveValue) return;
- style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+ style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_BORDER_BOTTOM_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderBottomStyle, BorderBottomStyle, BorderStyle)
if (!primitiveValue) return;
- style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+ style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_BORDER_LEFT_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderLeftStyle, BorderLeftStyle, BorderStyle)
if (!primitiveValue) return;
- style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+ style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_OUTLINE_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(outlineStyle, OutlineStyle, BorderStyle)
if (!primitiveValue) return;
- style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+ style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_CAPTION_SIDE:
{
@@ -2279,11 +2279,11 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
EFloat f;
switch(primitiveValue->getIdent())
{
- case CSS_VAL__KHTML_LEFT:
+ case CSS_VAL__TDEHTML_LEFT:
f = FLEFT_ALIGN; break;
case CSS_VAL_LEFT:
f = FLEFT; break;
- case CSS_VAL__KHTML_RIGHT:
+ case CSS_VAL__TDEHTML_RIGHT:
f = FRIGHT_ALIGN; break;
case CSS_VAL_RIGHT:
f = FRIGHT; break;
@@ -2659,8 +2659,8 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
EWhiteSpace s;
switch(primitiveValue->getIdent()) {
- case CSS_VAL__KHTML_NOWRAP:
- s = KHTML_NOWRAP;
+ case CSS_VAL__TDEHTML_NOWRAP:
+ s = TDEHTML_NOWRAP;
break;
case CSS_VAL_NOWRAP:
s = NOWRAP;
@@ -2700,14 +2700,14 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setBorderVerticalSpacing(parentStyle->borderVerticalSpacing());
break;
}
- case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING: {
+ case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING: {
HANDLE_INHERIT_AND_INITIAL(borderHorizontalSpacing, BorderHorizontalSpacing)
if (!primitiveValue) break;
short spacing = primitiveValue->computeLength(style, paintDeviceMetrics);
style->setBorderHorizontalSpacing(spacing);
break;
}
- case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: {
+ case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING: {
HANDLE_INHERIT_AND_INITIAL(borderVerticalSpacing, BorderVerticalSpacing)
if (!primitiveValue) break;
short spacing = primitiveValue->computeLength(style, paintDeviceMetrics);
@@ -2759,7 +2759,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
return;
int ident = primitiveValue->getIdent();
if ( ident ) {
- if ( ident == CSS_VAL__KHTML_TEXT )
+ if ( ident == CSS_VAL__TDEHTML_TEXT )
col = element->getDocument()->textColor();
// ### should be eliminated
else if ( ident == CSS_VAL_TRANSPARENT
@@ -3152,7 +3152,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
align = SUB; break;
case CSS_VAL_SUPER:
align = SUPER; break;
- case CSS_VAL__KHTML_BASELINE_MIDDLE:
+ case CSS_VAL__TDEHTML_BASELINE_MIDDLE:
align = BASELINE_MIDDLE; break;
default:
return;
@@ -3210,7 +3210,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
case CSS_VAL_LARGE: size = int( fontSizes[4] ); break;
case CSS_VAL_X_LARGE: size = int( fontSizes[5] ); break;
case CSS_VAL_XX_LARGE: size = int( fontSizes[6] ); break;
- case CSS_VAL__KHTML_XXX_LARGE: size = int( fontSizes[7] ); break;
+ case CSS_VAL__TDEHTML_XXX_LARGE: size = int( fontSizes[7] ); break;
case CSS_VAL_LARGER:
size = nextFontSize(fontSizes, oldSize, false);
break;
@@ -3326,7 +3326,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
HANDLE_INHERIT_AND_INITIAL(textAlign, TextAlign)
if (!primitiveValue) return;
if (primitiveValue->getIdent())
- style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__KHTML_AUTO) );
+ style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__TDEHTML_AUTO) );
return;
}
@@ -3581,15 +3581,15 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setTextDecoration(t);
break;
}
- case CSS_PROP__KHTML_FLOW_MODE:
+ case CSS_PROP__TDEHTML_FLOW_MODE:
HANDLE_INHERIT_AND_INITIAL(flowAroundFloats, FlowAroundFloats)
if (!primitiveValue) return;
if (primitiveValue->getIdent()) {
- style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__KHTML_AROUND_FLOATS );
+ style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__TDEHTML_AROUND_FLOATS );
return;
}
break;
- case CSS_PROP__KHTML_USER_INPUT: {
+ case CSS_PROP__TDEHTML_USER_INPUT: {
if(value->cssValueType() == CSSValue::CSS_INHERIT)
{
if(!parentNode) return;
@@ -3843,7 +3843,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
// Clamp opacity to the range 0-1
style->setOpacity(kMin(1.0f, kMax(0.0f, (float)primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER))));
break;
- case CSS_PROP__KHTML_MARQUEE:
+ case CSS_PROP__TDEHTML_MARQUEE:
if (value->cssValueType() != CSSValue::CSS_INHERIT || !parentNode) return;
style->setMarqueeDirection(parentStyle->marqueeDirection());
style->setMarqueeIncrement(parentStyle->marqueeIncrement());
@@ -3851,7 +3851,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setMarqueeLoopCount(parentStyle->marqueeLoopCount());
style->setMarqueeBehavior(parentStyle->marqueeBehavior());
break;
- case CSS_PROP__KHTML_MARQUEE_REPETITION: {
+ case CSS_PROP__TDEHTML_MARQUEE_REPETITION: {
HANDLE_INHERIT_AND_INITIAL(marqueeLoopCount, MarqueeLoopCount)
if (!primitiveValue) return;
if (primitiveValue->getIdent() == CSS_VAL_INFINITE)
@@ -3860,7 +3860,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setMarqueeLoopCount((int)(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)));
break;
}
- case CSS_PROP__KHTML_MARQUEE_SPEED: {
+ case CSS_PROP__TDEHTML_MARQUEE_SPEED: {
HANDLE_INHERIT_AND_INITIAL(marqueeSpeed, MarqueeSpeed)
if (!primitiveValue) return;
if (primitiveValue->getIdent()) {
@@ -3885,7 +3885,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setMarqueeSpeed(int(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)));
break;
}
- case CSS_PROP__KHTML_MARQUEE_INCREMENT: {
+ case CSS_PROP__TDEHTML_MARQUEE_INCREMENT: {
HANDLE_INHERIT_AND_INITIAL(marqueeIncrement, MarqueeIncrement)
if (!primitiveValue) return;
if (primitiveValue->getIdent()) {
@@ -3910,7 +3910,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
}
break;
}
- case CSS_PROP__KHTML_MARQUEE_STYLE: {
+ case CSS_PROP__TDEHTML_MARQUEE_STYLE: {
HANDLE_INHERIT_AND_INITIAL(marqueeBehavior, MarqueeBehavior)
if (!primitiveValue || !primitiveValue->getIdent()) return;
switch (primitiveValue->getIdent())
@@ -3933,7 +3933,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
}
break;
}
- case CSS_PROP__KHTML_MARQUEE_DIRECTION: {
+ case CSS_PROP__TDEHTML_MARQUEE_DIRECTION: {
HANDLE_INHERIT_AND_INITIAL(marqueeDirection, MarqueeDirection)
if (!primitiveValue || !primitiveValue->getIdent()) return;
switch (primitiveValue->getIdent())
diff --git a/tdehtml/css/cssstyleselector.h b/tdehtml/css/cssstyleselector.h
index ad6903de7..f826c0323 100644
--- a/tdehtml/css/cssstyleselector.h
+++ b/tdehtml/css/cssstyleselector.h
@@ -30,10 +30,10 @@
#include "dom/dom_string.h"
#include "xml/dom_restyler.h"
-class KHTMLSettings;
-class KHTMLView;
-class KHTMLPart;
-class KHTMLFactory;
+class TDEHTMLSettings;
+class TDEHTMLView;
+class TDEHTMLPart;
+class TDEHTMLFactory;
class KURL;
namespace DOM {
@@ -127,7 +127,7 @@ namespace tdehtml
KDE_EXPORT static void clear();
static void reparseConfiguration();
- static void loadDefaultStyle(const KHTMLSettings *s, DOM::DocumentImpl *doc);
+ static void loadDefaultStyle(const TDEHTMLSettings *s, DOM::DocumentImpl *doc);
RenderStyle *styleForElement(DOM::ElementImpl *e);
@@ -189,7 +189,7 @@ namespace tdehtml
public:
private:
- void init(const KHTMLSettings* settings, DOM::DocumentImpl* doc);
+ void init(const TDEHTMLSettings* settings, DOM::DocumentImpl* doc);
void mapBackgroundAttachment(BackgroundLayer* layer, DOM::CSSValueImpl* value);
void mapBackgroundClip(BackgroundLayer* layer, DOM::CSSValueImpl* value);
@@ -246,9 +246,9 @@ public:
RenderStyle *parentStyle;
DOM::ElementImpl *element;
DOM::NodeImpl *parentNode;
- KHTMLView *view;
- KHTMLPart *part;
- const KHTMLSettings *settings;
+ TDEHTMLView *view;
+ TDEHTMLPart *part;
+ const TDEHTMLSettings *settings;
TQPaintDeviceMetrics *paintDeviceMetrics;
TQValueVector m_fontSizes;
TQValueVector m_fixedFontSizes;
diff --git a/tdehtml/css/cssvalues.c b/tdehtml/css/cssvalues.c
index 28ceede3d..1cd8075e8 100644
--- a/tdehtml/css/cssvalues.c
+++ b/tdehtml/css/cssvalues.c
@@ -597,9 +597,9 @@ findValue (register const char *str, register unsigned int len)
#line 35 "cssvalues.gperf"
{"small-caps", CSS_VAL_SMALL_CAPS},
#line 122 "cssvalues.gperf"
- {"-tdehtml-text", CSS_VAL__KHTML_TEXT},
+ {"-tdehtml-text", CSS_VAL__TDEHTML_TEXT},
#line 141 "cssvalues.gperf"
- {"-tdehtml-left", CSS_VAL__KHTML_LEFT},
+ {"-tdehtml-left", CSS_VAL__TDEHTML_LEFT},
#line 97 "cssvalues.gperf"
{"background", CSS_VAL_BACKGROUND},
#line 178 "cssvalues.gperf"
@@ -615,9 +615,9 @@ findValue (register const char *str, register unsigned int len)
#line 198 "cssvalues.gperf"
{"table-caption", CSS_VAL_TABLE_CAPTION},
#line 154 "cssvalues.gperf"
- {"-tdehtml-lao", CSS_VAL__KHTML_LAO},
+ {"-tdehtml-lao", CSS_VAL__TDEHTML_LAO},
#line 143 "cssvalues.gperf"
- {"-tdehtml-center", CSS_VAL__KHTML_CENTER},
+ {"-tdehtml-center", CSS_VAL__TDEHTML_CENTER},
#line 54 "cssvalues.gperf"
{"x-large", CSS_VAL_X_LARGE},
#line 30 "cssvalues.gperf"
@@ -625,29 +625,29 @@ findValue (register const char *str, register unsigned int len)
#line 203 "cssvalues.gperf"
{"progress", CSS_VAL_PROGRESS},
#line 16 "cssvalues.gperf"
- {"-tdehtml-native", CSS_VAL__KHTML_NATIVE},
+ {"-tdehtml-native", CSS_VAL__TDEHTML_NATIVE},
#line 177 "cssvalues.gperf"
{"hiragana", CSS_VAL_HIRAGANA},
#line 171 "cssvalues.gperf"
{"lower-greek", CSS_VAL_LOWER_GREEK},
#line 150 "cssvalues.gperf"
- {"-tdehtml-diamond", CSS_VAL__KHTML_DIAMOND},
+ {"-tdehtml-diamond", CSS_VAL__TDEHTML_DIAMOND},
#line 224 "cssvalues.gperf"
{"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
#line 61 "cssvalues.gperf"
{"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
#line 158 "cssvalues.gperf"
- {"-tdehtml-tibetan", CSS_VAL__KHTML_TIBETAN},
+ {"-tdehtml-tibetan", CSS_VAL__TDEHTML_TIBETAN},
#line 124 "cssvalues.gperf"
{"repeat-x", CSS_VAL_REPEAT_X},
#line 266 "cssvalues.gperf"
- {"-tdehtml-normal", CSS_VAL__KHTML_NORMAL},
+ {"-tdehtml-normal", CSS_VAL__TDEHTML_NORMAL},
#line 113 "cssvalues.gperf"
{"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
#line 219 "cssvalues.gperf"
{"uppercase", CSS_VAL_UPPERCASE},
#line 136 "cssvalues.gperf"
- {"-tdehtml-auto", CSS_VAL__KHTML_AUTO},
+ {"-tdehtml-auto", CSS_VAL__TDEHTML_AUTO},
#line 163 "cssvalues.gperf"
{"georgian", CSS_VAL_GEORGIAN},
#line 229 "cssvalues.gperf"
@@ -657,13 +657,13 @@ findValue (register const char *str, register unsigned int len)
#line 109 "cssvalues.gperf"
{"infobackground", CSS_VAL_INFOBACKGROUND},
#line 157 "cssvalues.gperf"
- {"-tdehtml-thai", CSS_VAL__KHTML_THAI},
+ {"-tdehtml-thai", CSS_VAL__TDEHTML_THAI},
#line 226 "cssvalues.gperf"
{"open-quote", CSS_VAL_OPEN_QUOTE},
#line 173 "cssvalues.gperf"
{"lower-alpha", CSS_VAL_LOWER_ALPHA},
#line 156 "cssvalues.gperf"
- {"-tdehtml-urdu", CSS_VAL__KHTML_URDU},
+ {"-tdehtml-urdu", CSS_VAL__TDEHTML_URDU},
#line 223 "cssvalues.gperf"
{"close-quote", CSS_VAL_CLOSE_QUOTE},
#line 104 "cssvalues.gperf"
@@ -671,13 +671,13 @@ findValue (register const char *str, register unsigned int len)
#line 225 "cssvalues.gperf"
{"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
#line 231 "cssvalues.gperf"
- {"-tdehtml-nowrap", CSS_VAL__KHTML_NOWRAP},
+ {"-tdehtml-nowrap", CSS_VAL__TDEHTML_NOWRAP},
#line 67 "cssvalues.gperf"
{"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
#line 105 "cssvalues.gperf"
{"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
#line 155 "cssvalues.gperf"
- {"-tdehtml-persian", CSS_VAL__KHTML_PERSIAN},
+ {"-tdehtml-persian", CSS_VAL__TDEHTML_PERSIAN},
#line 116 "cssvalues.gperf"
{"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
#line 96 "cssvalues.gperf"
@@ -691,13 +691,13 @@ findValue (register const char *str, register unsigned int len)
#line 251 "cssvalues.gperf"
{"line-through", CSS_VAL_LINE_THROUGH},
#line 142 "cssvalues.gperf"
- {"-tdehtml-right", CSS_VAL__KHTML_RIGHT},
+ {"-tdehtml-right", CSS_VAL__TDEHTML_RIGHT},
#line 160 "cssvalues.gperf"
{"upper-roman", CSS_VAL_UPPER_ROMAN},
#line 135 "cssvalues.gperf"
- {"-tdehtml-baseline-middle", CSS_VAL__KHTML_BASELINE_MIDDLE},
+ {"-tdehtml-baseline-middle", CSS_VAL__TDEHTML_BASELINE_MIDDLE},
#line 153 "cssvalues.gperf"
- {"-tdehtml-arabic-indic", CSS_VAL__KHTML_ARABIC_INDIC},
+ {"-tdehtml-arabic-indic", CSS_VAL__TDEHTML_ARABIC_INDIC},
#line 152 "cssvalues.gperf"
{"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
#line 115 "cssvalues.gperf"
@@ -707,13 +707,13 @@ findValue (register const char *str, register unsigned int len)
#line 99 "cssvalues.gperf"
{"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
#line 56 "cssvalues.gperf"
- {"-tdehtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE},
+ {"-tdehtml-xxx-large", CSS_VAL__TDEHTML_XXX_LARGE},
#line 267 "cssvalues.gperf"
- {"-tdehtml-around-floats", CSS_VAL__KHTML_AROUND_FLOATS},
+ {"-tdehtml-around-floats", CSS_VAL__TDEHTML_AROUND_FLOATS},
#line 191 "cssvalues.gperf"
{"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
#line 182 "cssvalues.gperf"
- {"-tdehtml-close-quote", CSS_VAL__KHTML_CLOSE_QUOTE},
+ {"-tdehtml-close-quote", CSS_VAL__TDEHTML_CLOSE_QUOTE},
#line 179 "cssvalues.gperf"
{"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
#line 193 "cssvalues.gperf"
@@ -723,23 +723,23 @@ findValue (register const char *str, register unsigned int len)
#line 175 "cssvalues.gperf"
{"upper-alpha", CSS_VAL_UPPER_ALPHA},
#line 181 "cssvalues.gperf"
- {"-tdehtml-open-quote", CSS_VAL__KHTML_OPEN_QUOTE},
+ {"-tdehtml-open-quote", CSS_VAL__TDEHTML_OPEN_QUOTE},
#line 165 "cssvalues.gperf"
- {"-tdehtml-japanese-formal", CSS_VAL__KHTML_JAPANESE_FORMAL},
+ {"-tdehtml-japanese-formal", CSS_VAL__TDEHTML_JAPANESE_FORMAL},
#line 166 "cssvalues.gperf"
- {"-tdehtml-japanese-informal", CSS_VAL__KHTML_JAPANESE_INFORMAL},
+ {"-tdehtml-japanese-informal", CSS_VAL__TDEHTML_JAPANESE_INFORMAL},
#line 192 "cssvalues.gperf"
{"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
#line 169 "cssvalues.gperf"
- {"-tdehtml-trad-chinese-formal", CSS_VAL__KHTML_TRAD_CHINESE_FORMAL},
+ {"-tdehtml-trad-chinese-formal", CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL},
#line 170 "cssvalues.gperf"
- {"-tdehtml-trad-chinese-informal", CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL},
+ {"-tdehtml-trad-chinese-informal", CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL},
#line 167 "cssvalues.gperf"
- {"-tdehtml-simp-chinese-formal", CSS_VAL__KHTML_SIMP_CHINESE_FORMAL},
+ {"-tdehtml-simp-chinese-formal", CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL},
#line 168 "cssvalues.gperf"
- {"-tdehtml-simp-chinese-informal", CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL},
+ {"-tdehtml-simp-chinese-informal", CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL},
#line 172 "cssvalues.gperf"
- {"-tdehtml-upper-greek", CSS_VAL__KHTML_UPPER_GREEK}
+ {"-tdehtml-upper-greek", CSS_VAL__TDEHTML_UPPER_GREEK}
};
static const short lookup[] =
diff --git a/tdehtml/css/cssvalues.h b/tdehtml/css/cssvalues.h
index 36a365754..12d606acc 100644
--- a/tdehtml/css/cssvalues.h
+++ b/tdehtml/css/cssvalues.h
@@ -11,7 +11,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_MIN 1
#define CSS_VAL_INHERIT 1
#define CSS_VAL_INITIAL 2
-#define CSS_VAL__KHTML_NATIVE 3
+#define CSS_VAL__TDEHTML_NATIVE 3
#define CSS_VAL_NONE 4
#define CSS_VAL_HIDDEN 5
#define CSS_VAL_INSET 6
@@ -51,7 +51,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_LARGE 40
#define CSS_VAL_X_LARGE 41
#define CSS_VAL_XX_LARGE 42
-#define CSS_VAL__KHTML_XXX_LARGE 43
+#define CSS_VAL__TDEHTML_XXX_LARGE 43
#define CSS_VAL_SMALLER 44
#define CSS_VAL_LARGER 45
#define CSS_VAL_WIDER 46
@@ -117,7 +117,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_WINDOWFRAME 106
#define CSS_VAL_WINDOWTEXT 107
#define CSS_VAL_GREY 108
-#define CSS_VAL__KHTML_TEXT 109
+#define CSS_VAL__TDEHTML_TEXT 109
#define CSS_VAL_REPEAT 110
#define CSS_VAL_REPEAT_X 111
#define CSS_VAL_REPEAT_Y 112
@@ -130,44 +130,44 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_TEXT_BOTTOM 119
#define CSS_VAL_TOP 120
#define CSS_VAL_BOTTOM 121
-#define CSS_VAL__KHTML_BASELINE_MIDDLE 122
-#define CSS_VAL__KHTML_AUTO 123
+#define CSS_VAL__TDEHTML_BASELINE_MIDDLE 122
+#define CSS_VAL__TDEHTML_AUTO 123
#define CSS_VAL_LEFT 124
#define CSS_VAL_RIGHT 125
#define CSS_VAL_CENTER 126
#define CSS_VAL_JUSTIFY 127
-#define CSS_VAL__KHTML_LEFT 128
-#define CSS_VAL__KHTML_RIGHT 129
-#define CSS_VAL__KHTML_CENTER 130
+#define CSS_VAL__TDEHTML_LEFT 128
+#define CSS_VAL__TDEHTML_RIGHT 129
+#define CSS_VAL__TDEHTML_CENTER 130
#define CSS_VAL_OUTSIDE 131
#define CSS_VAL_INSIDE 132
#define CSS_VAL_DISC 133
#define CSS_VAL_CIRCLE 134
#define CSS_VAL_SQUARE 135
#define CSS_VAL_BOX 136
-#define CSS_VAL__KHTML_DIAMOND 137
+#define CSS_VAL__TDEHTML_DIAMOND 137
#define CSS_VAL_DECIMAL 138
#define CSS_VAL_DECIMAL_LEADING_ZERO 139
-#define CSS_VAL__KHTML_ARABIC_INDIC 140
-#define CSS_VAL__KHTML_LAO 141
-#define CSS_VAL__KHTML_PERSIAN 142
-#define CSS_VAL__KHTML_URDU 143
-#define CSS_VAL__KHTML_THAI 144
-#define CSS_VAL__KHTML_TIBETAN 145
+#define CSS_VAL__TDEHTML_ARABIC_INDIC 140
+#define CSS_VAL__TDEHTML_LAO 141
+#define CSS_VAL__TDEHTML_PERSIAN 142
+#define CSS_VAL__TDEHTML_URDU 143
+#define CSS_VAL__TDEHTML_THAI 144
+#define CSS_VAL__TDEHTML_TIBETAN 145
#define CSS_VAL_LOWER_ROMAN 146
#define CSS_VAL_UPPER_ROMAN 147
#define CSS_VAL_HEBREW 148
#define CSS_VAL_ARMENIAN 149
#define CSS_VAL_GEORGIAN 150
#define CSS_VAL_CJK_IDEOGRAPHIC 151
-#define CSS_VAL__KHTML_JAPANESE_FORMAL 152
-#define CSS_VAL__KHTML_JAPANESE_INFORMAL 153
-#define CSS_VAL__KHTML_SIMP_CHINESE_FORMAL 154
-#define CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL 155
-#define CSS_VAL__KHTML_TRAD_CHINESE_FORMAL 156
-#define CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL 157
+#define CSS_VAL__TDEHTML_JAPANESE_FORMAL 152
+#define CSS_VAL__TDEHTML_JAPANESE_INFORMAL 153
+#define CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL 154
+#define CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL 155
+#define CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL 156
+#define CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL 157
#define CSS_VAL_LOWER_GREEK 158
-#define CSS_VAL__KHTML_UPPER_GREEK 159
+#define CSS_VAL__TDEHTML_UPPER_GREEK 159
#define CSS_VAL_LOWER_ALPHA 160
#define CSS_VAL_LOWER_LATIN 161
#define CSS_VAL_UPPER_ALPHA 162
@@ -176,8 +176,8 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_KATAKANA 165
#define CSS_VAL_HIRAGANA_IROHA 166
#define CSS_VAL_KATAKANA_IROHA 167
-#define CSS_VAL__KHTML_OPEN_QUOTE 168
-#define CSS_VAL__KHTML_CLOSE_QUOTE 169
+#define CSS_VAL__TDEHTML_OPEN_QUOTE 168
+#define CSS_VAL__TDEHTML_CLOSE_QUOTE 169
#define CSS_VAL_INLINE 170
#define CSS_VAL_BLOCK 171
#define CSS_VAL_LIST_ITEM 172
@@ -226,7 +226,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_PRE 215
#define CSS_VAL_PRE_WRAP 216
#define CSS_VAL_PRE_LINE 217
-#define CSS_VAL__KHTML_NOWRAP 218
+#define CSS_VAL__TDEHTML_NOWRAP 218
#define CSS_VAL_BREAK_WORD 219
#define CSS_VAL_ABOVE 220
#define CSS_VAL_ABSOLUTE 221
@@ -261,8 +261,8 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_THICK 250
#define CSS_VAL_THIN 251
#define CSS_VAL_UNDERLINE 252
-#define CSS_VAL__KHTML_NORMAL 253
-#define CSS_VAL__KHTML_AROUND_FLOATS 254
+#define CSS_VAL__TDEHTML_NORMAL 253
+#define CSS_VAL__TDEHTML_AROUND_FLOATS 254
#define CSS_VAL_BORDER_BOX 255
#define CSS_VAL_CONTENT_BOX 256
#define CSS_VAL_ENABLED 257
diff --git a/tdehtml/css/cssvalues.in b/tdehtml/css/cssvalues.in
index b85d49f17..30ed44475 100644
--- a/tdehtml/css/cssvalues.in
+++ b/tdehtml/css/cssvalues.in
@@ -350,16 +350,16 @@ thick
thin
underline
#
-# CSS_PROP__KHTML_FLOW_MODE
+# CSS_PROP__TDEHTML_FLOW_MODE
-tdehtml-normal
-tdehtml-around-floats
# CSS3 Values
-# CSS_PROP__KHTML_BOX_SIZING
+# CSS_PROP__TDEHTML_BOX_SIZING
border-box
content-box
-# CSS_PROP__KHTML_USER_INPUT
+# CSS_PROP__TDEHTML_USER_INPUT
enabled
disabled
#none
diff --git a/tdehtml/css/parser.cpp b/tdehtml/css/parser.cpp
index f88b7d002..3e8ee89fd 100644
--- a/tdehtml/css/parser.cpp
+++ b/tdehtml/css/parser.cpp
@@ -81,9 +81,9 @@
FONT_FACE_SYM = 273,
CHARSET_SYM = 274,
NAMESPACE_SYM = 275,
- KHTML_RULE_SYM = 276,
- KHTML_DECLS_SYM = 277,
- KHTML_VALUE_SYM = 278,
+ TDEHTML_RULE_SYM = 276,
+ TDEHTML_DECLS_SYM = 277,
+ TDEHTML_VALUE_SYM = 278,
IMPORTANT_SYM = 279,
QEMS = 280,
EMS = 281,
@@ -129,9 +129,9 @@
#define FONT_FACE_SYM 273
#define CHARSET_SYM 274
#define NAMESPACE_SYM 275
-#define KHTML_RULE_SYM 276
-#define KHTML_DECLS_SYM 277
-#define KHTML_VALUE_SYM 278
+#define TDEHTML_RULE_SYM 276
+#define TDEHTML_DECLS_SYM 277
+#define TDEHTML_VALUE_SYM 278
#define IMPORTANT_SYM 279
#define QEMS 280
#define EMS 281
@@ -589,7 +589,7 @@ static const char *const yytname[] =
"INCLUDES", "DASHMATCH", "BEGINSWITH", "ENDSWITH", "CONTAINS", "STRING",
"IDENT", "NTH", "HASH", "':'", "'.'", "'['", "'*'", "'|'", "IMPORT_SYM",
"PAGE_SYM", "MEDIA_SYM", "FONT_FACE_SYM", "CHARSET_SYM", "NAMESPACE_SYM",
- "KHTML_RULE_SYM", "KHTML_DECLS_SYM", "KHTML_VALUE_SYM", "IMPORTANT_SYM",
+ "TDEHTML_RULE_SYM", "TDEHTML_DECLS_SYM", "TDEHTML_VALUE_SYM", "IMPORTANT_SYM",
"QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", "INS", "PTS", "PCS", "DEGS",
"RADS", "GRADS", "MSECS", "SECS", "HERZ", "KHERZ", "DIMEN", "PERCENTAGE",
"FLOAT", "INTEGER", "URI", "FUNCTION", "NOTFUNCTION", "UNICODERANGE",
diff --git a/tdehtml/css/parser.h b/tdehtml/css/parser.h
index e3375db66..2920fd9de 100644
--- a/tdehtml/css/parser.h
+++ b/tdehtml/css/parser.h
@@ -48,9 +48,9 @@
FONT_FACE_SYM = 273,
CHARSET_SYM = 274,
NAMESPACE_SYM = 275,
- KHTML_RULE_SYM = 276,
- KHTML_DECLS_SYM = 277,
- KHTML_VALUE_SYM = 278,
+ TDEHTML_RULE_SYM = 276,
+ TDEHTML_DECLS_SYM = 277,
+ TDEHTML_VALUE_SYM = 278,
IMPORTANT_SYM = 279,
QEMS = 280,
EMS = 281,
@@ -96,9 +96,9 @@
#define FONT_FACE_SYM 273
#define CHARSET_SYM 274
#define NAMESPACE_SYM 275
-#define KHTML_RULE_SYM 276
-#define KHTML_DECLS_SYM 277
-#define KHTML_VALUE_SYM 278
+#define TDEHTML_RULE_SYM 276
+#define TDEHTML_DECLS_SYM 277
+#define TDEHTML_VALUE_SYM 278
#define IMPORTANT_SYM 279
#define QEMS 280
#define EMS 281
diff --git a/tdehtml/css/parser.y b/tdehtml/css/parser.y
index bb6f915f9..6d8b18e9a 100644
--- a/tdehtml/css/parser.y
+++ b/tdehtml/css/parser.y
@@ -164,9 +164,9 @@ static int cssyylex( YYSTYPE *yylval ) {
%token FONT_FACE_SYM
%token CHARSET_SYM
%token NAMESPACE_SYM
-%token KHTML_RULE_SYM
-%token KHTML_DECLS_SYM
-%token KHTML_VALUE_SYM
+%token TDEHTML_RULE_SYM
+%token TDEHTML_DECLS_SYM
+%token TDEHTML_VALUE_SYM
%token IMPORTANT_SYM
@@ -261,20 +261,20 @@ stylesheet:
;
tdehtml_rule:
- KHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
+ TDEHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
CSSParser *p = static_cast(parser);
p->rule = $4;
}
;
tdehtml_decls:
- KHTML_DECLS_SYM declaration_block {
+ TDEHTML_DECLS_SYM declaration_block {
/* can be empty */
}
;
tdehtml_value:
- KHTML_VALUE_SYM '{' maybe_space expr '}' {
+ TDEHTML_VALUE_SYM '{' maybe_space expr '}' {
CSSParser *p = static_cast(parser);
if ( $4 ) {
p->valueList = $4;
diff --git a/tdehtml/css/tokenizer.cpp b/tdehtml/css/tokenizer.cpp
index 493a98032..48fd174d1 100644
--- a/tdehtml/css/tokenizer.cpp
+++ b/tdehtml/css/tokenizer.cpp
@@ -756,17 +756,17 @@ YY_RULE_SETUP
case 20:
YY_RULE_SETUP
#line 53 "tokenizer.flex"
-{yyTok = KHTML_RULE_SYM; return yyTok; }
+{yyTok = TDEHTML_RULE_SYM; return yyTok; }
YY_BREAK
case 21:
YY_RULE_SETUP
#line 54 "tokenizer.flex"
-{yyTok = KHTML_DECLS_SYM; return yyTok; }
+{yyTok = TDEHTML_DECLS_SYM; return yyTok; }
YY_BREAK
case 22:
YY_RULE_SETUP
#line 55 "tokenizer.flex"
-{yyTok = KHTML_VALUE_SYM; return yyTok; }
+{yyTok = TDEHTML_VALUE_SYM; return yyTok; }
YY_BREAK
case 23:
YY_RULE_SETUP
diff --git a/tdehtml/css/tokenizer.flex b/tdehtml/css/tokenizer.flex
index 76fcadb7c..330d13042 100644
--- a/tdehtml/css/tokenizer.flex
+++ b/tdehtml/css/tokenizer.flex
@@ -50,9 +50,9 @@ nth (-?[0-9]*n[\+-][0-9]+)|(-?[0-9]*n)
"@font-face" {yyTok = FONT_FACE_SYM; return yyTok;}
"@charset" {yyTok = CHARSET_SYM; return yyTok;}
"@namespace" {yyTok = NAMESPACE_SYM; return yyTok; }
-"@-tdehtml-rule" {yyTok = KHTML_RULE_SYM; return yyTok; }
-"@-tdehtml-decls" {yyTok = KHTML_DECLS_SYM; return yyTok; }
-"@-tdehtml-value" {yyTok = KHTML_VALUE_SYM; return yyTok; }
+"@-tdehtml-rule" {yyTok = TDEHTML_RULE_SYM; return yyTok; }
+"@-tdehtml-decls" {yyTok = TDEHTML_DECLS_SYM; return yyTok; }
+"@-tdehtml-value" {yyTok = TDEHTML_VALUE_SYM; return yyTok; }
"!"{w}"important" {yyTok = IMPORTANT_SYM; return yyTok;}
diff --git a/tdehtml/design.h b/tdehtml/design.h
index 86dbec911..f287a5ef9 100644
--- a/tdehtml/design.h
+++ b/tdehtml/design.h
@@ -36,7 +36,7 @@
* If you want to add to your application a widget that only needs simple text
* browsing, you can also use the KTextBrowser widget in tdeui.
*
- * KHTMLPart :
+ * TDEHTMLPart :
* The main part/widget for using tdehtml.
*
* DOM :
diff --git a/tdehtml/dom/css_rule.h b/tdehtml/dom/css_rule.h
index 5f27e8f8a..9059eecd7 100644
--- a/tdehtml/dom/css_rule.h
+++ b/tdehtml/dom/css_rule.h
@@ -49,7 +49,7 @@ class CSSRuleImpl;
* interface.
*
*/
-class KHTML_EXPORT CSSRule
+class TDEHTML_EXPORT CSSRule
{
public:
CSSRule();
@@ -72,7 +72,7 @@ public:
MEDIA_RULE = 4,
FONT_FACE_RULE = 5,
PAGE_RULE = 6,
- QUIRKS_RULE = 100 // KHTML CSS Extension
+ QUIRKS_RULE = 100 // TDEHTML CSS Extension
};
/**
@@ -146,7 +146,7 @@ class CSSCharsetRuleImpl;
* be used to define the encoding of the style sheet.
*
*/
-class KHTML_EXPORT CSSCharsetRule : public CSSRule
+class TDEHTML_EXPORT CSSCharsetRule : public CSSRule
{
public:
CSSCharsetRule();
@@ -190,7 +190,7 @@ class CSSFontFaceRuleImpl;
* rule is used to hold a set of font descriptions.
*
*/
-class KHTML_EXPORT CSSFontFaceRule : public CSSRule
+class TDEHTML_EXPORT CSSFontFaceRule : public CSSRule
{
public:
CSSFontFaceRule();
@@ -220,7 +220,7 @@ class CSSImportRuleImpl;
* rule is used to import style rules from other style sheets.
*
*/
-class KHTML_EXPORT CSSImportRule : public CSSRule
+class TDEHTML_EXPORT CSSImportRule : public CSSRule
{
public:
CSSImportRule();
@@ -267,7 +267,7 @@ class CSSMediaRuleImpl;
* can be used to delimit style rules for specific media types.
*
*/
-class KHTML_EXPORT CSSMediaRule : public CSSRule
+class TDEHTML_EXPORT CSSMediaRule : public CSSRule
{
public:
CSSMediaRule();
@@ -359,7 +359,7 @@ class CSSPageRuleImpl;
* page box for paged media.
*
*/
-class KHTML_EXPORT CSSPageRule : public CSSRule
+class TDEHTML_EXPORT CSSPageRule : public CSSRule
{
public:
CSSPageRule();
@@ -408,7 +408,7 @@ class CSSStyleRuleImpl;
* in a CSS style sheet.
*
*/
-class KHTML_EXPORT CSSStyleRule : public CSSRule
+class TDEHTML_EXPORT CSSStyleRule : public CSSRule
{
public:
CSSStyleRule();
@@ -458,7 +458,7 @@ class CSSUnknownRuleImpl;
* not supported by this user agent.
*
*/
-class KHTML_EXPORT CSSUnknownRule : public CSSRule
+class TDEHTML_EXPORT CSSUnknownRule : public CSSRule
{
public:
CSSUnknownRule();
@@ -481,7 +481,7 @@ class StyleListImpl;
* of an ordered collection of CSS rules.
*
*/
-class KHTML_EXPORT CSSRuleList
+class TDEHTML_EXPORT CSSRuleList
{
public:
CSSRuleList();
diff --git a/tdehtml/dom/css_stylesheet.h b/tdehtml/dom/css_stylesheet.h
index d220ffa76..884c6bec5 100644
--- a/tdehtml/dom/css_stylesheet.h
+++ b/tdehtml/dom/css_stylesheet.h
@@ -55,7 +55,7 @@ class DocumentImpl;
* instruction .
*
*/
-class KHTML_EXPORT StyleSheet
+class TDEHTML_EXPORT StyleSheet
{
public:
StyleSheet();
@@ -170,7 +170,7 @@ protected:
* This exception is raised when a specific CSS operation is impossible
* to perform.
*/
-class KHTML_EXPORT CSSException
+class TDEHTML_EXPORT CSSException
{
public:
CSSException(unsigned short _code) { code = _code; }
@@ -204,7 +204,7 @@ class CSSRuleList;
* content type is "text/css".
*
*/
-class KHTML_EXPORT CSSStyleSheet : public StyleSheet
+class TDEHTML_EXPORT CSSStyleSheet : public StyleSheet
{
public:
CSSStyleSheet();
@@ -306,7 +306,7 @@ class StyleSheet;
* abstraction of an ordered collection of style sheets.
*
*/
-class KHTML_EXPORT StyleSheetList
+class TDEHTML_EXPORT StyleSheetList
{
public:
StyleSheetList();
@@ -360,7 +360,7 @@ class CSSStyleSheet;
* strings.
*
*/
-class KHTML_EXPORT MediaList
+class TDEHTML_EXPORT MediaList
{
public:
MediaList();
@@ -444,7 +444,7 @@ protected:
class LinkStyleImpl;
-class KHTML_EXPORT LinkStyle
+class TDEHTML_EXPORT LinkStyle
{
public:
LinkStyle();
@@ -466,7 +466,7 @@ protected:
class DocumentStyleImpl;
-class KHTML_EXPORT DocumentStyle
+class TDEHTML_EXPORT DocumentStyle
{
public:
DocumentStyle();
diff --git a/tdehtml/dom/css_value.h b/tdehtml/dom/css_value.h
index 5d4a043c7..e2028feac 100644
--- a/tdehtml/dom/css_value.h
+++ b/tdehtml/dom/css_value.h
@@ -57,7 +57,7 @@ class CSSValue;
* interface.
*
*/
-class KHTML_EXPORT CSSStyleDeclaration
+class TDEHTML_EXPORT CSSStyleDeclaration
{
public:
CSSStyleDeclaration();
@@ -240,7 +240,7 @@ class CSSValueImpl;
* complexe value.
*
*/
-class KHTML_EXPORT CSSValue
+class TDEHTML_EXPORT CSSValue
{
public:
CSSValue();
@@ -313,7 +313,7 @@ class CSSValue;
* of an ordered collection of CSS values.
*
*/
-class KHTML_EXPORT CSSValueList : public CSSValue
+class TDEHTML_EXPORT CSSValueList : public CSSValue
{
public:
CSSValueList();
@@ -370,7 +370,7 @@ class Rect;
* \c CSSStyleDeclaration interface.
*
*/
-class KHTML_EXPORT CSSPrimitiveValue : public CSSValue
+class TDEHTML_EXPORT CSSPrimitiveValue : public CSSValue
{
public:
CSSPrimitiveValue();
@@ -588,7 +588,7 @@ public:
* interface modify the style property.
*
*/
-class KHTML_EXPORT RGBColor
+class TDEHTML_EXPORT RGBColor
{
public:
RGBColor();
@@ -639,7 +639,7 @@ class RectImpl;
* interface modify the style property.
*
*/
-class KHTML_EXPORT Rect
+class TDEHTML_EXPORT Rect
{
friend class CSSPrimitiveValue;
public:
@@ -696,7 +696,7 @@ class CounterImpl;
* made through this interface modify the style property.
*
*/
-class KHTML_EXPORT Counter
+class TDEHTML_EXPORT Counter
{
friend class CSSPrimitiveValue;
public:
diff --git a/tdehtml/dom/dom2_events.h b/tdehtml/dom/dom2_events.h
index 285a0c10e..3b68eafaa 100644
--- a/tdehtml/dom/dom2_events.h
+++ b/tdehtml/dom/dom2_events.h
@@ -61,7 +61,7 @@ class MutationEventImpl;
* add them manually.
*
*/
-class KHTML_EXPORT EventListener : public DomShared {
+class TDEHTML_EXPORT EventListener : public DomShared {
public:
EventListener();
virtual ~EventListener();
@@ -108,7 +108,7 @@ protected:
* implemented by the object passed to the event listener.
*
*/
-class KHTML_EXPORT Event {
+class TDEHTML_EXPORT Event {
friend class Document;
friend class NodeImpl;
friend class DocumentImpl;
@@ -259,7 +259,7 @@ protected:
* descriptions.
*
*/
-class KHTML_EXPORT EventException
+class TDEHTML_EXPORT EventException
{
public:
EventException(unsigned short _code);
@@ -291,7 +291,7 @@ public:
* with User Interface events.
*
*/
-class KHTML_EXPORT UIEvent : public Event {
+class TDEHTML_EXPORT UIEvent : public Event {
public:
UIEvent();
UIEvent(const UIEvent &other);
@@ -396,7 +396,7 @@ protected:
* obtain notification of mouse events which occur within its descendent elements.
*
*/
-class KHTML_EXPORT MouseEvent : public UIEvent {
+class TDEHTML_EXPORT MouseEvent : public UIEvent {
public:
MouseEvent();
MouseEvent(const MouseEvent &other);
@@ -552,7 +552,7 @@ protected:
* as specified in current DOM3 Events revision. This is doing heavy emulation
* at the moment
*/
-class KHTML_EXPORT TextEvent : public UIEvent {
+class TDEHTML_EXPORT TextEvent : public UIEvent {
public:
TextEvent();
TextEvent(const TextEvent &other);
@@ -735,7 +735,7 @@ protected:
* associated with Mutation events.
*
*/
-class KHTML_EXPORT MutationEvent : public Event {
+class TDEHTML_EXPORT MutationEvent : public Event {
public:
MutationEvent();
MutationEvent(const MutationEvent &other);
diff --git a/tdehtml/dom/dom2_range.h b/tdehtml/dom/dom2_range.h
index 290f4f48c..1f69b4a99 100644
--- a/tdehtml/dom/dom2_range.h
+++ b/tdehtml/dom/dom2_range.h
@@ -44,7 +44,7 @@ class RangeImpl;
class DOMException;
// Introduced in DOM Level 2:
-class KHTML_EXPORT RangeException {
+class TDEHTML_EXPORT RangeException {
public:
RangeException(unsigned short _code) { code = _code; }
RangeException(const RangeException &other) { code = other.code; }
@@ -67,7 +67,7 @@ public:
};
-class KHTML_EXPORT Range
+class TDEHTML_EXPORT Range
{
friend class DocumentImpl;
friend class Document;
diff --git a/tdehtml/dom/dom2_traversal.h b/tdehtml/dom/dom2_traversal.h
index ea3d3521b..a1fc86bb3 100644
--- a/tdehtml/dom/dom2_traversal.h
+++ b/tdehtml/dom/dom2_traversal.h
@@ -57,7 +57,7 @@ class CustomNodeFilterImpl;
* interface.
*
*/
-class KHTML_EXPORT NodeIterator
+class TDEHTML_EXPORT NodeIterator
{
friend class NodeIteratorImpl;
friend class Document;
@@ -181,7 +181,7 @@ protected:
* an instance of it to the NodeFilter. For more details see the
* CustomNodeFilter class
*/
-class KHTML_EXPORT NodeFilter
+class TDEHTML_EXPORT NodeFilter
{
friend class NodeIterator;
friend class NodeIteratorImpl;
@@ -292,7 +292,7 @@ protected:
*
*/
-class KHTML_EXPORT CustomNodeFilter : public DomShared {
+class TDEHTML_EXPORT CustomNodeFilter : public DomShared {
public:
CustomNodeFilter();
virtual ~CustomNodeFilter();
@@ -336,7 +336,7 @@ protected:
* how deeply nested the structure of the original document.
*
*/
-class KHTML_EXPORT TreeWalker
+class TDEHTML_EXPORT TreeWalker
{
friend class Document;
friend class TreeWalkerImpl;
diff --git a/tdehtml/dom/dom2_views.h b/tdehtml/dom/dom2_views.h
index 6f326aaa3..dcba1cb40 100644
--- a/tdehtml/dom/dom2_views.h
+++ b/tdehtml/dom/dom2_views.h
@@ -38,7 +38,7 @@ class DOMString;
* A base interface that all views shall derive from.
*
*/
-class KHTML_EXPORT AbstractView {
+class TDEHTML_EXPORT AbstractView {
friend class Event;
friend class UIEvent;
friend class MouseEvent;
diff --git a/tdehtml/dom/dom_doc.cpp b/tdehtml/dom/dom_doc.cpp
index 0ff123444..b38a01401 100644
--- a/tdehtml/dom/dom_doc.cpp
+++ b/tdehtml/dom/dom_doc.cpp
@@ -438,7 +438,7 @@ void Document::setSelectedStylesheetSet(const DOMString& s)
}
-KHTMLView *Document::view() const
+TDEHTMLView *Document::view() const
{
if (!impl) return 0;
diff --git a/tdehtml/dom/dom_doc.h b/tdehtml/dom/dom_doc.h
index 9a5331295..cef6692c5 100644
--- a/tdehtml/dom/dom_doc.h
+++ b/tdehtml/dom/dom_doc.h
@@ -32,8 +32,8 @@
#include
#include
-class KHTMLView;
-class KHTMLPart;
+class TDEHTMLView;
+class TDEHTMLPart;
namespace DOM {
@@ -74,7 +74,7 @@ class HTMLDocument;
* DOM Level 2 and newer provide means for creating documents directly,
* which was not possible with DOM Level 1.
*/
-class KHTML_EXPORT DOMImplementation
+class TDEHTML_EXPORT DOMImplementation
{
friend class Document;
public:
@@ -242,10 +242,10 @@ protected:
* context they were created.
*
*/
-class KHTML_EXPORT Document : public Node
+class TDEHTML_EXPORT Document : public Node
{
- friend class ::KHTMLView;
- friend class ::KHTMLPart;
+ friend class ::TDEHTMLView;
+ friend class ::TDEHTMLPart;
friend class AbstractView;
friend class DOMImplementation;
friend class HTMLFrameElement;
@@ -786,9 +786,9 @@ public:
void removeStyleSheet(const StyleSheet &sheet);
/**
- * @return The KHTML view widget of this document.
+ * @return The TDEHTML view widget of this document.
*/
- KHTMLView *view() const;
+ TDEHTMLView *view() const;
/**
* Introduced in DOM Level 2
@@ -988,7 +988,7 @@ class DocumentFragmentImpl;
* \c insertBefore() and \c appendChild() .
*
*/
-class KHTML_EXPORT DocumentFragment : public Node
+class TDEHTML_EXPORT DocumentFragment : public Node
{
friend class Document;
friend class HTMLElementImpl;
@@ -1025,7 +1025,7 @@ class DOMString;
* nodes.
*
*/
-class KHTML_EXPORT DocumentType : public Node
+class TDEHTML_EXPORT DocumentType : public Node
{
friend class Document;
friend class DOMImplementation;
diff --git a/tdehtml/dom/dom_element.h b/tdehtml/dom/dom_element.h
index d3313628e..8df181c17 100644
--- a/tdehtml/dom/dom_element.h
+++ b/tdehtml/dom/dom_element.h
@@ -86,7 +86,7 @@ class DocumentImpl;
* unknown, there are no tokenized attribute values.
*
*/
-class KHTML_EXPORT Attr : public Node
+class TDEHTML_EXPORT Attr : public Node
{
friend class Element;
friend class Document;
@@ -207,7 +207,7 @@ class DOMString;
* access an attribute value can safely be used as a convenience.
*
*/
-class KHTML_EXPORT Element : public Node
+class TDEHTML_EXPORT Element : public Node
{
friend class Document;
friend class HTMLDocument;
@@ -579,7 +579,7 @@ public:
bool isHTMLElement() const;
/**
- * KHTML extension to DOM
+ * TDEHTML extension to DOM
* This method returns the associated form element.
* returns null if this element is not a form-like element
* or if this elment is not in the scope of a form element.
diff --git a/tdehtml/dom/dom_exception.h b/tdehtml/dom/dom_exception.h
index cef032206..f4c4b4e75 100644
--- a/tdehtml/dom/dom_exception.h
+++ b/tdehtml/dom/dom_exception.h
@@ -54,7 +54,7 @@ namespace DOM {
* the corresponding method descriptions.
*
*/
-class KHTML_EXPORT DOMException
+class TDEHTML_EXPORT DOMException
{
public:
DOMException(unsigned short _code) { code = _code; }
diff --git a/tdehtml/dom/dom_misc.h b/tdehtml/dom/dom_misc.h
index 4cded0f00..494ab2704 100644
--- a/tdehtml/dom/dom_misc.h
+++ b/tdehtml/dom/dom_misc.h
@@ -33,7 +33,7 @@ namespace DOM {
* Other objects should overload deleteMe() to fit their needs. The default
* implementation deletes the object if the ref count drops to 0.
*/
-class KHTML_EXPORT DomShared
+class TDEHTML_EXPORT DomShared
{
public:
DomShared() : _ref( 0 ) {}
diff --git a/tdehtml/dom/dom_node.h b/tdehtml/dom/dom_node.h
index 594aa5e3e..b87997547 100644
--- a/tdehtml/dom/dom_node.h
+++ b/tdehtml/dom/dom_node.h
@@ -63,7 +63,7 @@ class Event;
* imply that the DOM specifies an order to these Nodes.
*
*/
-class KHTML_EXPORT NamedNodeMap
+class TDEHTML_EXPORT NamedNodeMap
{
public:
NamedNodeMap();
@@ -271,7 +271,7 @@ class NodeImpl;
* mechanisms to get and set the relevant information.
*
*/
-class KHTML_EXPORT Node
+class TDEHTML_EXPORT Node
{
friend class NamedNodeMap;
friend class NodeList;
@@ -775,7 +775,7 @@ public:
*
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * Note: KHTML will also raise this if setContent is called on things
+ * Note: TDEHTML will also raise this if setContent is called on things
* that do not have child nodes.
*
* @since 3.5.7
@@ -928,7 +928,7 @@ class NodeListImpl;
* integral index, starting from 0.
*
*/
-class KHTML_EXPORT NodeList
+class TDEHTML_EXPORT NodeList
{
friend class Element;
friend class Node;
diff --git a/tdehtml/dom/dom_string.h b/tdehtml/dom/dom_string.h
index 3d4706b5a..a82d1018b 100644
--- a/tdehtml/dom/dom_string.h
+++ b/tdehtml/dom/dom_string.h
@@ -40,10 +40,10 @@ class DOMStringImpl;
* that modifications to one instance will also modify all others. If you
* wish to get a DOMString that is independent, use copy().
*/
-class KHTML_EXPORT DOMString
+class TDEHTML_EXPORT DOMString
{
friend class CharacterDataImpl;
- friend KHTML_EXPORT bool operator==( const DOMString &a, const char *b );
+ friend TDEHTML_EXPORT bool operator==( const DOMString &a, const char *b );
public:
/**
* default constructor. Gives an empty DOMString
@@ -128,17 +128,17 @@ inline kndbgstream &operator<<(kndbgstream &stream, const DOMString &) {
}
#endif
-KHTML_EXPORT bool operator==( const DOMString &a, const DOMString &b );
-KHTML_EXPORT bool operator==( const DOMString &a, const TQString &b );
-KHTML_EXPORT bool operator==( const DOMString &a, const char *b );
+TDEHTML_EXPORT bool operator==( const DOMString &a, const DOMString &b );
+TDEHTML_EXPORT bool operator==( const DOMString &a, const TQString &b );
+TDEHTML_EXPORT bool operator==( const DOMString &a, const char *b );
inline bool operator!=( const DOMString &a, const DOMString &b ) { return !(a==b); }
inline bool operator!=( const DOMString &a, const TQString &b ) { return !(a==b); }
inline bool operator!=( const DOMString &a, const char *b ) { return !(a==b); }
inline bool strcmp( const DOMString &a, const DOMString &b ) { return a != b; }
// returns false when equal, true otherwise (ignoring case)
-KHTML_EXPORT bool strcasecmp( const DOMString &a, const DOMString &b );
-KHTML_EXPORT bool strcasecmp( const DOMString& a, const char* b );
+TDEHTML_EXPORT bool strcasecmp( const DOMString &a, const DOMString &b );
+TDEHTML_EXPORT bool strcasecmp( const DOMString& a, const char* b );
}
#endif
diff --git a/tdehtml/dom/dom_text.h b/tdehtml/dom/dom_text.h
index c6f92fb1d..bc84f5902 100644
--- a/tdehtml/dom/dom_text.h
+++ b/tdehtml/dom/dom_text.h
@@ -46,7 +46,7 @@ class CharacterDataImpl;
* offsets in this interface start from 0.
*
*/
-class KHTML_EXPORT CharacterData : public Node
+class TDEHTML_EXPORT CharacterData : public Node
{
friend class CharacterDataImpl;
@@ -220,7 +220,7 @@ class CommentImpl;
* the full SGML comment structure.
*
*/
-class KHTML_EXPORT Comment : public CharacterData
+class TDEHTML_EXPORT Comment : public CharacterData
{
friend class Document;
friend class TextImpl;
@@ -266,7 +266,7 @@ class TextImpl;
* \c XPointers.
*
*/
-class KHTML_EXPORT Text : public CharacterData
+class TDEHTML_EXPORT Text : public CharacterData
{
friend class Document;
friend class TextImpl;
diff --git a/tdehtml/dom/dom_xml.h b/tdehtml/dom/dom_xml.h
index 12e70d9e5..b2ef9f8e6 100644
--- a/tdehtml/dom/dom_xml.h
+++ b/tdehtml/dom/dom_xml.h
@@ -63,7 +63,7 @@ class ProcessingInstructionImpl;
* merged by use of the Element.normalize() method.
*
*/
-class KHTML_EXPORT CDATASection : public Text
+class TDEHTML_EXPORT CDATASection : public Text
{
friend class Document;
public:
@@ -121,7 +121,7 @@ class DOMString;
* An \c Entity node does not have any parent.
*
*/
-class KHTML_EXPORT Entity : public Node
+class TDEHTML_EXPORT Entity : public Node
{
public:
Entity();
@@ -185,7 +185,7 @@ protected:
* evaluation.
*
*/
-class KHTML_EXPORT EntityReference : public Node
+class TDEHTML_EXPORT EntityReference : public Node
{
friend class Document;
public:
@@ -219,7 +219,7 @@ class DOMString;
* A \c Notation node does not have any parent.
*
*/
-class KHTML_EXPORT Notation : public Node
+class TDEHTML_EXPORT Notation : public Node
{
public:
Notation();
@@ -256,7 +256,7 @@ protected:
* processor-specific information in the text of the document.
*
*/
-class KHTML_EXPORT ProcessingInstruction : public Node
+class TDEHTML_EXPORT ProcessingInstruction : public Node
{
friend class Document;
public:
diff --git a/tdehtml/dom/html_base.h b/tdehtml/dom/html_base.h
index c7ed878ce..1ff3fb825 100644
--- a/tdehtml/dom/html_base.h
+++ b/tdehtml/dom/html_base.h
@@ -47,7 +47,7 @@ class DOMString;
* BODY element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLBodyElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBodyElement : public HTMLElement
{
public:
HTMLBodyElement();
@@ -160,7 +160,7 @@ class DOMString;
* FRAME element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLFrameElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFrameElement : public HTMLElement
{
public:
HTMLFrameElement();
@@ -306,7 +306,7 @@ class DOMString;
* FRAMESET element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLFrameSetElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFrameSetElement : public HTMLElement
{
public:
HTMLFrameSetElement();
@@ -359,7 +359,7 @@ class HTMLIFrameElementImpl;
* IFRAME element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLIFrameElement : public HTMLElement
+class TDEHTML_EXPORT HTMLIFrameElement : public HTMLElement
{
public:
HTMLIFrameElement();
@@ -533,7 +533,7 @@ class DOMString;
* HEAD element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLHeadElement : public HTMLElement
+class TDEHTML_EXPORT HTMLHeadElement : public HTMLElement
{
public:
HTMLHeadElement();
@@ -574,7 +574,7 @@ class DOMString;
* HTML element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLHtmlElement : public HTMLElement
+class TDEHTML_EXPORT HTMLHtmlElement : public HTMLElement
{
public:
HTMLHtmlElement();
diff --git a/tdehtml/dom/html_block.h b/tdehtml/dom/html_block.h
index 4283bafa2..fc3963716 100644
--- a/tdehtml/dom/html_block.h
+++ b/tdehtml/dom/html_block.h
@@ -47,7 +47,7 @@ class DOMString;
* BLOCKQUOTE element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLBlockquoteElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBlockquoteElement : public HTMLElement
{
public:
HTMLBlockquoteElement();
@@ -88,7 +88,7 @@ class DOMString;
* DIV element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLDivElement : public HTMLElement
+class TDEHTML_EXPORT HTMLDivElement : public HTMLElement
{
public:
HTMLDivElement();
@@ -130,7 +130,7 @@ class DOMString;
* HR element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLHRElement : public HTMLElement
+class TDEHTML_EXPORT HTMLHRElement : public HTMLElement
{
public:
HTMLHRElement();
@@ -214,7 +214,7 @@ class DOMString;
* H1 element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLHeadingElement : public HTMLElement
+class TDEHTML_EXPORT HTMLHeadingElement : public HTMLElement
{
public:
HTMLHeadingElement();
@@ -255,7 +255,7 @@ class DOMString;
* element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLParagraphElement : public HTMLElement
+class TDEHTML_EXPORT HTMLParagraphElement : public HTMLElement
{
public:
HTMLParagraphElement();
@@ -296,7 +296,7 @@ class HTMLPreElementImpl;
* PRE element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLPreElement : public HTMLElement
+class TDEHTML_EXPORT HTMLPreElement : public HTMLElement
{
public:
HTMLPreElement();
@@ -334,7 +334,7 @@ class HTMLLayerElementImpl;
* Behaves mostly like absolute positioned DIV-blocks.
*
*/
-class KHTML_EXPORT HTMLLayerElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLayerElement : public HTMLElement
{
public:
HTMLLayerElement();
diff --git a/tdehtml/dom/html_document.cpp b/tdehtml/dom/html_document.cpp
index c24bf65f7..0d0af0ab9 100644
--- a/tdehtml/dom/html_document.cpp
+++ b/tdehtml/dom/html_document.cpp
@@ -39,7 +39,7 @@ HTMLDocument::HTMLDocument() : Document(false) // create the impl here
}
-HTMLDocument::HTMLDocument(KHTMLView *parent)
+HTMLDocument::HTMLDocument(TDEHTMLView *parent)
: Document(false) // create the impl here
{
impl = DOMImplementationImpl::instance()->createHTMLDocument(parent);
diff --git a/tdehtml/dom/html_document.h b/tdehtml/dom/html_document.h
index aa53de96c..98a027297 100644
--- a/tdehtml/dom/html_document.h
+++ b/tdehtml/dom/html_document.h
@@ -35,8 +35,8 @@
#include
-class KHTMLView;
-class KHTMLPart;
+class TDEHTMLView;
+class TDEHTMLPart;
namespace DOM {
@@ -70,10 +70,10 @@ class HTMLElement;
*
*
*/
-class KHTML_EXPORT HTMLDocument : public Document
+class TDEHTML_EXPORT HTMLDocument : public Document
{
- friend class ::KHTMLView;
- friend class ::KHTMLPart;
+ friend class ::TDEHTMLView;
+ friend class ::TDEHTMLPart;
friend class DOMImplementation;
public:
HTMLDocument();
@@ -82,7 +82,7 @@ public:
* Rendering information (like sizes, etc...) is only created if
* parent != 0
*/
- HTMLDocument(KHTMLView *parent);
+ HTMLDocument(TDEHTMLView *parent);
HTMLDocument(const HTMLDocument &other);
HTMLDocument(const Node &other) : Document(false)
{(*this)=other;}
diff --git a/tdehtml/dom/html_element.h b/tdehtml/dom/html_element.h
index 1329793b2..719223777 100644
--- a/tdehtml/dom/html_element.h
+++ b/tdehtml/dom/html_element.h
@@ -32,7 +32,7 @@
#include
#include
-class KHTMLView;
+class TDEHTMLView;
namespace DOM {
@@ -66,10 +66,10 @@ class HTMLCollection;
* interface is reserved for future usage.
*
*/
-class KHTML_EXPORT HTMLElement : public Element
+class TDEHTML_EXPORT HTMLElement : public Element
{
friend class HTMLDocument;
- friend class ::KHTMLView;
+ friend class ::TDEHTMLView;
friend class HTMLTableElement;
friend class HTMLTableRowElement;
friend class HTMLTableSectionElement;
diff --git a/tdehtml/dom/html_form.h b/tdehtml/dom/html_form.h
index 0623e421b..d0e20da73 100644
--- a/tdehtml/dom/html_form.h
+++ b/tdehtml/dom/html_form.h
@@ -47,7 +47,7 @@ class DOMString;
* BUTTON element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLButtonElement : public HTMLElement
+class TDEHTML_EXPORT HTMLButtonElement : public HTMLElement
{
public:
HTMLButtonElement();
@@ -169,7 +169,7 @@ class HTMLFieldSetElementImpl;
* FIELDSET element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLFieldSetElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFieldSetElement : public HTMLElement
{
public:
HTMLFieldSetElement();
@@ -203,7 +203,7 @@ class HTMLFormElementImpl;
* FORM element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLFormElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFormElement : public HTMLElement
{
friend class HTMLButtonElement;
friend class HTMLFieldSetElement;
@@ -346,7 +346,7 @@ class HTMLInputElementImpl;
* INPUT element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLInputElement : public HTMLElement
+class TDEHTML_EXPORT HTMLInputElement : public HTMLElement
{
public:
HTMLInputElement();
@@ -707,7 +707,7 @@ class HTMLLabelElementImpl;
* LABEL element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLLabelElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLabelElement : public HTMLElement
{
public:
HTMLLabelElement();
@@ -762,7 +762,7 @@ class HTMLLegendElementImpl;
* LEGEND element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLLegendElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLegendElement : public HTMLElement
{
public:
HTMLLegendElement();
@@ -821,7 +821,7 @@ class HTMLOptGroupElementImpl;
* OPTGROUP element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLOptGroupElement : public HTMLElement
+class TDEHTML_EXPORT HTMLOptGroupElement : public HTMLElement
{
public:
HTMLOptGroupElement();
@@ -875,7 +875,7 @@ class HTMLSelectElementImpl;
* SELECT element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLSelectElement : public HTMLElement
+class TDEHTML_EXPORT HTMLSelectElement : public HTMLElement
{
public:
HTMLSelectElement();
@@ -1051,7 +1051,7 @@ class HTMLTextAreaElementImpl;
* TEXTAREA element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLTextAreaElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTextAreaElement : public HTMLElement
{
public:
HTMLTextAreaElement();
@@ -1266,7 +1266,7 @@ class HTMLOptionElementImpl;
* OPTION element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLOptionElement : public HTMLElement
+class TDEHTML_EXPORT HTMLOptionElement : public HTMLElement
{
public:
HTMLOptionElement();
@@ -1386,7 +1386,7 @@ class HTMLFormElement;
* deprecated in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLIsIndexElement : public HTMLElement
+class TDEHTML_EXPORT HTMLIsIndexElement : public HTMLElement
{
public:
HTMLIsIndexElement();
diff --git a/tdehtml/dom/html_head.h b/tdehtml/dom/html_head.h
index e8dc52d21..08bd1bc1c 100644
--- a/tdehtml/dom/html_head.h
+++ b/tdehtml/dom/html_head.h
@@ -43,7 +43,7 @@ class DOMString;
* BASE element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLBaseElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBaseElement : public HTMLElement
{
public:
HTMLBaseElement();
@@ -98,7 +98,7 @@ class HTMLLinkElementImpl;
* LINK element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLLinkElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLinkElement : public HTMLElement
{
public:
HTMLLinkElement();
@@ -253,7 +253,7 @@ class HTMLMetaElementImpl;
* META element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLMetaElement : public HTMLElement
+class TDEHTML_EXPORT HTMLMetaElement : public HTMLElement
{
public:
HTMLMetaElement();
@@ -332,7 +332,7 @@ class HTMLScriptElementImpl;
* SCRIPT element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLScriptElement : public HTMLElement
+class TDEHTML_EXPORT HTMLScriptElement : public HTMLElement
{
public:
HTMLScriptElement();
@@ -446,7 +446,7 @@ class HTMLStyleElementImpl;
* STYLE element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLStyleElement : public HTMLElement
+class TDEHTML_EXPORT HTMLStyleElement : public HTMLElement
{
public:
HTMLStyleElement();
@@ -519,7 +519,7 @@ class HTMLTitleElementImpl;
* TITLE element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLTitleElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTitleElement : public HTMLElement
{
public:
HTMLTitleElement();
diff --git a/tdehtml/dom/html_image.h b/tdehtml/dom/html_image.h
index 9f30aaa14..8258d7a63 100644
--- a/tdehtml/dom/html_image.h
+++ b/tdehtml/dom/html_image.h
@@ -44,7 +44,7 @@ class DOMString;
* AREA element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLAreaElement : public HTMLElement
+class TDEHTML_EXPORT HTMLAreaElement : public HTMLElement
{
public:
HTMLAreaElement();
@@ -182,7 +182,7 @@ class HTMLImageElementImpl;
* IMG element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLImageElement : public HTMLElement
+class TDEHTML_EXPORT HTMLImageElement : public HTMLElement
{
public:
HTMLImageElement();
@@ -390,7 +390,7 @@ class DOMString;
* MAP element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLMapElement : public HTMLElement
+class TDEHTML_EXPORT HTMLMapElement : public HTMLElement
{
public:
HTMLMapElement();
diff --git a/tdehtml/dom/html_inline.h b/tdehtml/dom/html_inline.h
index f92ed6917..322282d1f 100644
--- a/tdehtml/dom/html_inline.h
+++ b/tdehtml/dom/html_inline.h
@@ -44,7 +44,7 @@ class DOMString;
* element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLAnchorElement : public HTMLElement
+class TDEHTML_EXPORT HTMLAnchorElement : public HTMLElement
{
public:
HTMLAnchorElement();
@@ -256,7 +256,7 @@ class HTMLBRElementImpl;
* element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLBRElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBRElement : public HTMLElement
{
public:
HTMLBRElement();
@@ -299,7 +299,7 @@ class DOMString;
* deprecated in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLFontElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFontElement : public HTMLElement
{
public:
HTMLFontElement();
@@ -369,7 +369,7 @@ class DOMString;
* DEL element definitions in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLModElement : public HTMLElement
+class TDEHTML_EXPORT HTMLModElement : public HTMLElement
{
public:
HTMLModElement();
@@ -427,7 +427,7 @@ class HTMLQuoteElementImpl;
* element. To resolve ambiquities, we use this one for the \c Q
* element only.
*/
-class KHTML_EXPORT HTMLQuoteElement : public HTMLElement
+class TDEHTML_EXPORT HTMLQuoteElement : public HTMLElement
{
public:
HTMLQuoteElement();
diff --git a/tdehtml/dom/html_list.h b/tdehtml/dom/html_list.h
index 34c081cb5..59328ec26 100644
--- a/tdehtml/dom/html_list.h
+++ b/tdehtml/dom/html_list.h
@@ -49,7 +49,7 @@ class DOMString;
* DL element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLDListElement : public HTMLElement
+class TDEHTML_EXPORT HTMLDListElement : public HTMLElement
{
public:
HTMLDListElement();
@@ -89,7 +89,7 @@ public:
* in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLDirectoryElement : public HTMLElement
+class TDEHTML_EXPORT HTMLDirectoryElement : public HTMLElement
{
public:
HTMLDirectoryElement();
@@ -128,7 +128,7 @@ public:
* LI element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLLIElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLIElement : public HTMLElement
{
public:
HTMLLIElement();
@@ -183,7 +183,7 @@ public:
* deprecated in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLMenuElement : public HTMLElement
+class TDEHTML_EXPORT HTMLMenuElement : public HTMLElement
{
public:
HTMLMenuElement();
@@ -223,7 +223,7 @@ public:
* OL element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLOListElement : public HTMLElement
+class TDEHTML_EXPORT HTMLOListElement : public HTMLElement
{
public:
HTMLOListElement();
@@ -291,7 +291,7 @@ public:
* UL element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLUListElement : public HTMLElement
+class TDEHTML_EXPORT HTMLUListElement : public HTMLElement
{
public:
HTMLUListElement();
diff --git a/tdehtml/dom/html_misc.h b/tdehtml/dom/html_misc.h
index 643e5caf6..9cb6dc976 100644
--- a/tdehtml/dom/html_misc.h
+++ b/tdehtml/dom/html_misc.h
@@ -45,7 +45,7 @@ class HTMLCollectionImpl;
* deprecated in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLBaseFontElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBaseFontElement : public HTMLElement
{
public:
HTMLBaseFontElement();
@@ -123,7 +123,7 @@ public:
* automatically updated when the underlying document is changed.
*
*/
-class KHTML_EXPORT HTMLCollection
+class TDEHTML_EXPORT HTMLCollection
{
friend class HTMLDocument;
friend class HTMLSelectElement;
@@ -201,7 +201,7 @@ protected:
HTMLCollectionImpl *impl;
};
-class KHTML_EXPORT HTMLFormCollection : public HTMLCollection
+class TDEHTML_EXPORT HTMLFormCollection : public HTMLCollection
{
friend class HTMLFormElement;
protected:
@@ -211,7 +211,7 @@ protected:
/**
@internal. Not part of the public API
*/
-class KHTML_EXPORT HTMLMappedNameCollection : public HTMLCollection
+class TDEHTML_EXPORT HTMLMappedNameCollection : public HTMLCollection
{
public:
HTMLMappedNameCollection(NodeImpl *base, int type, const DOMString &name );
diff --git a/tdehtml/dom/html_object.h b/tdehtml/dom/html_object.h
index 9195a40f7..56c592fa3 100644
--- a/tdehtml/dom/html_object.h
+++ b/tdehtml/dom/html_object.h
@@ -47,7 +47,7 @@ class HTMLAppletElementImpl;
* deprecated in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLAppletElement : public HTMLElement
+class TDEHTML_EXPORT HTMLAppletElement : public HTMLElement
{
public:
HTMLAppletElement();
@@ -255,7 +255,7 @@ class HTMLObjectElementImpl;
* OBJECT element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLObjectElement : public HTMLElement
+class TDEHTML_EXPORT HTMLObjectElement : public HTMLElement
{
public:
HTMLObjectElement();
@@ -554,7 +554,7 @@ class HTMLParamElementImpl;
* PARAM element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLParamElement : public HTMLElement
+class TDEHTML_EXPORT HTMLParamElement : public HTMLElement
{
public:
HTMLParamElement();
diff --git a/tdehtml/dom/html_table.h b/tdehtml/dom/html_table.h
index 6b9a2d99d..fdc1119cb 100644
--- a/tdehtml/dom/html_table.h
+++ b/tdehtml/dom/html_table.h
@@ -44,7 +44,7 @@ class DOMString;
* CAPTION element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLTableCaptionElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableCaptionElement : public HTMLElement
{
friend class HTMLTableElement;
@@ -88,7 +88,7 @@ class HTMLTableCellElementImpl;
* TD element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLTableCellElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableCellElement : public HTMLElement
{
friend class HTMLTableElement;
@@ -319,7 +319,7 @@ class HTMLTableColElementImpl;
* COL element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLTableColElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableColElement : public HTMLElement
{
friend class HTMLTableElement;
@@ -438,7 +438,7 @@ class DOMString;
* TABLE element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLTableElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableElement : public HTMLElement
{
public:
HTMLTableElement();
@@ -722,7 +722,7 @@ class DOMString;
* TR element definition in HTML 4.0.
*
*/
-class KHTML_EXPORT HTMLTableRowElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableRowElement : public HTMLElement
{
friend class HTMLTableElement;
@@ -892,7 +892,7 @@ class DOMString;
* elements.
*
*/
-class KHTML_EXPORT HTMLTableSectionElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableSectionElement : public HTMLElement
{
friend class HTMLTableElement;
diff --git a/tdehtml/domtreeview.cpp b/tdehtml/domtreeview.cpp
index 7482c7b81..5bff83e72 100644
--- a/tdehtml/domtreeview.cpp
+++ b/tdehtml/domtreeview.cpp
@@ -19,7 +19,7 @@
#include "domtreeview.moc"
#include "xml/dom_nodeimpl.h"
-DOMTreeView::DOMTreeView(TQWidget *parent, KHTMLPart *currentpart, const char * name) : KListView(parent, name)
+DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char * name) : KListView(parent, name)
{
setCaption(name);
setRootIsDecorated(true);
diff --git a/tdehtml/domtreeview.h b/tdehtml/domtreeview.h
index ef3d45c44..93baa8f61 100644
--- a/tdehtml/domtreeview.h
+++ b/tdehtml/domtreeview.h
@@ -28,7 +28,7 @@ class DOMTreeView : public KListView
{
Q_OBJECT
public:
- DOMTreeView(TQWidget *parent, KHTMLPart *part, const char * name = 0);
+ DOMTreeView(TQWidget *parent, TDEHTMLPart *part, const char * name = 0);
~DOMTreeView();
void recursive(const DOM::Node &pNode, const DOM::Node &node);
@@ -47,7 +47,7 @@ class DOMTreeView : public KListView
TQPtrDict m_nodedict;
DOM::Node document;
- KHTMLPart *part;
+ TDEHTMLPart *part;
};
diff --git a/tdehtml/ecma/README b/tdehtml/ecma/README
index 4c341699a..f44d663a0 100644
--- a/tdehtml/ecma/README
+++ b/tdehtml/ecma/README
@@ -1,7 +1,7 @@
This module contains the ECMAScript a.k.a. JavaScript language bindings for
-the KHTML Part.
+the TDEHTML Part.
-The module is loaded into KHTML's address space on demand.
+The module is loaded into TDEHTML's address space on demand.
To test the non-HTML DOM functions you may compile a little interactive
interpreter called 'testecma' with 'make check' (see testecma.cpp for
diff --git a/tdehtml/ecma/kjs_binding.cpp b/tdehtml/ecma/kjs_binding.cpp
index 09961fbb5..d9f0b7b25 100644
--- a/tdehtml/ecma/kjs_binding.cpp
+++ b/tdehtml/ecma/kjs_binding.cpp
@@ -232,7 +232,7 @@ bool ScriptInterpreter::isWindowOpenAllowed() const
bool eventOk = ( // mouse events
id == DOM::EventImpl::CLICK_EVENT ||
id == DOM::EventImpl::MOUSEUP_EVENT || id == DOM::EventImpl::MOUSEDOWN_EVENT ||
- id == DOM::EventImpl::KHTML_ECMA_CLICK_EVENT || id == DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT ||
+ id == DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT || id == DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT ||
// keyboard events
id == DOM::EventImpl::KEYDOWN_EVENT || id == DOM::EventImpl::KEYPRESS_EVENT ||
id == DOM::EventImpl::KEYUP_EVENT ||
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index 47921fb2a..ec794b8d2 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -249,12 +249,12 @@ KJSDebugWin * KJSDebugWin::kjs_html_debugger = 0;
TQString SourceFile::getCode()
{
if (interpreter) {
- KHTMLPart *part = ::tqqt_cast(static_cast(interpreter)->part());
- if (part && url == part->url().url() && KHTMLPageCache::self()->isValid(part->cacheId())) {
+ TDEHTMLPart *part = ::tqqt_cast(static_cast(interpreter)->part());
+ if (part && url == part->url().url() && TDEHTMLPageCache::self()->isValid(part->cacheId())) {
Decoder *decoder = part->createDecoder();
TQByteArray data;
TQDataStream stream(data,IO_WriteOnly);
- KHTMLPageCache::self()->saveData(part->cacheId(),&stream);
+ TDEHTMLPageCache::self()->saveData(part->cacheId(),&stream);
TQString str;
if (data.size() == 0)
str = "";
@@ -721,7 +721,7 @@ bool KJSDebugWin::sourceParsed(KJS::ExecState *exec, int sourceId,
KParts::ReadOnlyPart *part = static_cast(exec->interpreter())->part();
if (m_nextSourceUrl == part->url().url()) {
// Only store the code here if it's not from the part's html page... in that
- // case we can get it from KHTMLPageCache
+ // case we can get it from TDEHTMLPageCache
code = TQString::null;
}
@@ -805,7 +805,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
return true;
KParts::ReadOnlyPart *part = static_cast(exec->interpreter())->part();
- KHTMLPart *tdehtmlpart = ::tqqt_cast(part);
+ TDEHTMLPart *tdehtmlpart = ::tqqt_cast(part);
if (tdehtmlpart && !tdehtmlpart->settings()->isJavaScriptErrorReportingEnabled())
return true;
diff --git a/tdehtml/ecma/kjs_dom.cpp b/tdehtml/ecma/kjs_dom.cpp
index 71e91d7ef..77d4983da 100644
--- a/tdehtml/ecma/kjs_dom.cpp
+++ b/tdehtml/ecma/kjs_dom.cpp
@@ -265,11 +265,11 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const
case OnChange:
return getListener(DOM::EventImpl::CHANGE_EVENT);
case OnClick:
- return getListener(DOM::EventImpl::KHTML_ECMA_CLICK_EVENT);
+ return getListener(DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT);
case OnDblClick:
- return getListener(DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT);
+ return getListener(DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT);
case OnDragDrop:
- return getListener(DOM::EventImpl::KHTML_DRAGDROP_EVENT);
+ return getListener(DOM::EventImpl::TDEHTML_DRAGDROP_EVENT);
case OnError:
return getListener(DOM::EventImpl::ERROR_EVENT);
case OnFocus:
@@ -293,7 +293,7 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const
case OnMouseUp:
return getListener(DOM::EventImpl::MOUSEUP_EVENT);
case OnMove:
- return getListener(DOM::EventImpl::KHTML_MOVE_EVENT);
+ return getListener(DOM::EventImpl::TDEHTML_MOVE_EVENT);
case OnReset:
return getListener(DOM::EventImpl::RESET_EVENT);
case OnResize:
@@ -409,13 +409,13 @@ void DOMNode::putValueProperty(ExecState *exec, int token, const Value& value, i
setListener(exec,DOM::EventImpl::CHANGE_EVENT,value);
break;
case OnClick:
- setListener(exec,DOM::EventImpl::KHTML_ECMA_CLICK_EVENT,value);
+ setListener(exec,DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT,value);
break;
case OnDblClick:
- setListener(exec,DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT,value);
+ setListener(exec,DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT,value);
break;
case OnDragDrop:
- setListener(exec,DOM::EventImpl::KHTML_DRAGDROP_EVENT,value);
+ setListener(exec,DOM::EventImpl::TDEHTML_DRAGDROP_EVENT,value);
break;
case OnError:
setListener(exec,DOM::EventImpl::ERROR_EVENT,value);
@@ -451,7 +451,7 @@ void DOMNode::putValueProperty(ExecState *exec, int token, const Value& value, i
setListener(exec,DOM::EventImpl::MOUSEUP_EVENT,value);
break;
case OnMove:
- setListener(exec,DOM::EventImpl::KHTML_MOVE_EVENT,value);
+ setListener(exec,DOM::EventImpl::TDEHTML_MOVE_EVENT,value);
break;
case OnReset:
setListener(exec,DOM::EventImpl::RESET_EVENT,value);
@@ -949,7 +949,7 @@ Value DOMDocument::getValueProperty(ExecState *exec, int token) const
return getDOMStyleSheetList(exec, doc.styleSheets(), doc);
case DOMDocument::DefaultView: // DOM2
{
- KHTMLView *view = node.handle()->getDocument()->view();
+ TDEHTMLView *view = node.handle()->getDocument()->view();
if (view)
return Window::retrieve(view->part());
return getDOMAbstractView(exec, doc.defaultView());
@@ -963,7 +963,7 @@ Value DOMDocument::getValueProperty(ExecState *exec, int token) const
DOM::DocumentImpl* docimpl = node.handle()->getDocument();
if ( docimpl && docimpl->view() )
{
- KHTMLPart* part = docimpl->view()->part();
+ TDEHTMLPart* part = docimpl->view()->part();
if ( part ) {
if (part->d->m_bComplete) return String("complete");
if (docimpl->parsing()) return String("loading");
@@ -1088,7 +1088,7 @@ Value DOMDocumentProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List
Window* active = Window::retrieveActive(exec);
// Complete the URL using the "active part" (running interpreter). We do this for the security
// check and to make sure we load exactly the same url as we have verified to be safe
- KHTMLPart *tdehtmlpart = ::tqqt_cast(active->part());
+ TDEHTMLPart *tdehtmlpart = ::tqqt_cast(active->part());
if (tdehtmlpart) {
// Security: only allow documents to be loaded from the same host
TQString dstUrl = tdehtmlpart->htmlDocument().completeURL(s).string();
@@ -1274,7 +1274,7 @@ Value DOMDOMImplementationProtoFunc::tryCall(ExecState *exec, Object &thisObj, c
case DOMDOMImplementation::CreateDocument: { // DOM2
// Initially set the URL to document of the creator... this is so that it resides in the same
// host/domain for security checks. The URL will be updated if Document.load() is called.
- KHTMLPart *part = ::tqqt_cast(static_cast(exec->interpreter())->part());
+ TDEHTMLPart *part = ::tqqt_cast(static_cast(exec->interpreter())->part());
if (part) {
Document doc = implementation.createDocument(args[0].toString(exec).string(),args[1].toString(exec).string(),toNode(args[2]));
KURL url = static_cast(part->document().handle())->URL();
@@ -1526,7 +1526,7 @@ bool checkNodeSecurity(ExecState *exec, const DOM::Node& n)
// Check to see if the currently executing interpreter is allowed to access the specified node
if (n.isNull())
return true;
- KHTMLView *view = n.handle()->getDocument()->view();
+ TDEHTMLView *view = n.handle()->getDocument()->view();
Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L;
if ( !win || !win->isSafeScript(exec) )
return false;
diff --git a/tdehtml/ecma/kjs_events.cpp b/tdehtml/ecma/kjs_events.cpp
index 7b6ff3cc1..acf88f89a 100644
--- a/tdehtml/ecma/kjs_events.cpp
+++ b/tdehtml/ecma/kjs_events.cpp
@@ -63,7 +63,7 @@ void JSEventListener::handleEvent(DOM::Event &evt)
if (KJSDebugWin::debugWindow() && KJSDebugWin::debugWindow()->inSession())
return;
#endif
- KHTMLPart *part = ::tqqt_cast(static_cast(win.imp())->part());
+ TDEHTMLPart *part = ::tqqt_cast(static_cast(win.imp())->part());
KJSProxy *proxy = 0L;
if (part)
proxy = part->jScript();
@@ -163,7 +163,7 @@ Object JSLazyEventListener::listenerObj() const
void JSLazyEventListener::parseCode() const
{
if (!parsed) {
- KHTMLPart *part = ::tqqt_cast(static_cast(win.imp())->part());
+ TDEHTMLPart *part = ::tqqt_cast(static_cast(win.imp())->part());
KJSProxy *proxy = 0L;
if (part)
proxy = part->jScript();
diff --git a/tdehtml/ecma/kjs_html.cpp b/tdehtml/ecma/kjs_html.cpp
index 37fd70754..8a63ba943 100644
--- a/tdehtml/ecma/kjs_html.cpp
+++ b/tdehtml/ecma/kjs_html.cpp
@@ -98,7 +98,7 @@ Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List
case HTMLDocument::Open:
if (args.size() >= 3) // IE extension for document.open: it means window.open if it has 3 args or more
{
- KHTMLView *view = static_cast(doc.handle())->view();
+ TDEHTMLView *view = static_cast(doc.handle())->view();
if ( view && view->part() ) {
Window* win = Window::retrieveWindow(view->part());
if( win ) {
@@ -133,7 +133,7 @@ Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List
case HTMLDocument::GetSelection: {
// NS4 and Mozilla specific. IE uses document.selection.createRange()
// http://docs.sun.com/source/816-6408-10/document.htm#1195981
- KHTMLView *view = static_cast(doc.handle())->view();
+ TDEHTMLView *view = static_cast(doc.handle())->view();
if ( view && view->part() )
return String(view->part()->selectedText());
else
@@ -199,7 +199,7 @@ bool KJS::HTMLDocument::hasProperty(ExecState *exec, const Identifier &p) const
#endif
DOM::HTMLDocument doc = static_cast(node);
DOM::DocumentImpl* docImpl = static_cast(doc.handle());
- KHTMLView *view = docImpl->view();
+ TDEHTMLView *view = docImpl->view();
Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L;
if ( !win || !win->isSafeScript(exec) )
return false;
@@ -210,7 +210,7 @@ bool KJS::HTMLDocument::hasProperty(ExecState *exec, const Identifier &p) const
if ( view && view->part() )
{
- KHTMLPart *kp = view->part()->findFrame( p.qstring() );
+ TDEHTMLPart *kp = view->part()->findFrame( p.qstring() );
if (kp)
return true;
}
@@ -226,7 +226,7 @@ Value KJS::HTMLDocument::tryGet(ExecState *exec, const Identifier &propertyName)
DOM::HTMLDocument doc = static_cast(node);
DOM::DocumentImpl* docImpl = static_cast(doc.handle());
- KHTMLView *view = docImpl->view();
+ TDEHTMLView *view = docImpl->view();
Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L;
if ( !win || !win->isSafeScript(exec) )
@@ -261,7 +261,7 @@ Value KJS::HTMLDocument::tryGet(ExecState *exec, const Identifier &propertyName)
{
// ###### TODO return a collection in case several frames have the same name
// (IE does that). Hard to do with findFrame :}
- KHTMLPart *kp = view->part()->findFrame( propertyName.qstring() );
+ TDEHTMLPart *kp = view->part()->findFrame( propertyName.qstring() );
if (kp)
return Window::retrieve(kp);
}
@@ -356,7 +356,7 @@ void KJS::HTMLDocument::tryPut(ExecState *exec, const Identifier &propertyName,
#ifdef KJS_VERBOSE
kdDebug(6070) << "KJS::HTMLDocument::tryPut " << propertyName.qstring() << endl;
#endif
- KHTMLView *view = static_cast(node.handle())->view();
+ TDEHTMLView *view = static_cast(node.handle())->view();
Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L;
if ( !win || !win->isSafeScript(exec) )
@@ -394,7 +394,7 @@ void KJS::HTMLDocument::putValueProperty(ExecState *exec, int token, const Value
break;
case Location:
{
- KHTMLView *view = static_cast(doc.handle())->view();
+ TDEHTMLView *view = static_cast(doc.handle())->view();
if ( view )
Window::retrieveWindow(view->part())->goURL(exec, value.toString(exec).qstring(), false /*don't lock history*/);
break;
@@ -1127,7 +1127,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const
static KParts::LiveConnectExtension *getLiveConnectExtension(const DOM::HTMLElement & element)
{
DOM::HTMLDocument doc = element.ownerDocument();
- KHTMLView *view = static_cast(doc.handle())->view();
+ TDEHTMLView *view = static_cast(doc.handle())->view();
if (view && element.handle())
return view->part()->liveConnectExtension(static_cast(element.handle()->renderer()));
return 0L;
@@ -1870,7 +1870,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const
case FrameContentDocument: return checkNodeSecurity(exec,frameElement.contentDocument()) ?
getDOMNode(exec, frameElement.contentDocument()) : Undefined();
case FrameContentWindow: {
- KHTMLPart* part = static_cast(frameElement.handle())->contentPart();
+ TDEHTMLPart* part = static_cast(frameElement.handle())->contentPart();
if (part) {
Window *w = Window::retrieveWindow(part);
if (w)
@@ -1905,7 +1905,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const
case IFrameContentDocument: return checkNodeSecurity(exec,iFrame.contentDocument()) ?
getDOMNode(exec, iFrame.contentDocument()) : Undefined();
case IFrameContentWindow: {
- KHTMLPart* part = static_cast(iFrame.handle())->contentPart();
+ TDEHTMLPart* part = static_cast(iFrame.handle())->contentPart();
if (part) {
Window *w = Window::retrieveWindow(part);
if (w)
@@ -2123,14 +2123,14 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const
DOM::HTMLDocument doc = element.ownerDocument();
- KHTMLView *view = static_cast(doc.handle())->view();
- KHTMLSettings::KJSWindowOpenPolicy policy = KHTMLSettings::KJSWindowOpenAllow;
+ TDEHTMLView *view = static_cast(doc.handle())->view();
+ TDEHTMLSettings::KJSWindowOpenPolicy policy = TDEHTMLSettings::KJSWindowOpenAllow;
if (view)
policy = view->part()->settings()->windowOpenPolicy(view->part()->url().host());
bool block = false;
- if ( policy != KHTMLSettings::KJSWindowOpenAllow ) {
+ if ( policy != TDEHTMLSettings::KJSWindowOpenAllow ) {
block = true;
// if this is a form without a target, or a special target, don't block
@@ -2146,7 +2146,7 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const
if (!view->part()->url().host().isEmpty())
caption = view->part()->url().host() + " - ";
// search all (possibly nested) framesets
- KHTMLPart *currentPart = view->part()->parentPart();
+ TDEHTMLPart *currentPart = view->part()->parentPart();
while( currentPart != 0L ) {
if( currentPart->frameExists( form.target().string() ) )
block = false;
@@ -2154,7 +2154,7 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const
}
}
- if ( block && policy == KHTMLSettings::KJSWindowOpenAsk && view ) {
+ if ( block && policy == TDEHTMLSettings::KJSWindowOpenAsk && view ) {
if (view && view->part())
emit view->part()->browserExtension()->requestFocus(view->part());
caption += i18n( "Confirmation: JavaScript Popup" );
@@ -2167,7 +2167,7 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const
caption, i18n("Allow"), i18n("Do Not Allow") ) == KMessageBox::Yes )
block = false;
- } else if ( block && policy == KHTMLSettings::KJSWindowOpenSmart ) {
+ } else if ( block && policy == TDEHTMLSettings::KJSWindowOpenSmart ) {
if( static_cast(exec->interpreter())->isWindowOpenAllowed() ) {
// This submission has been triggered by the user
block = false;
diff --git a/tdehtml/ecma/kjs_mozilla.cpp b/tdehtml/ecma/kjs_mozilla.cpp
index 216fde26e..6fc7688dd 100644
--- a/tdehtml/ecma/kjs_mozilla.cpp
+++ b/tdehtml/ecma/kjs_mozilla.cpp
@@ -40,7 +40,7 @@ const ClassInfo MozillaSidebarExtension::info = { "sidebar", 0, &MozillaSidebarE
}
IMPLEMENT_PROTOFUNC_DOM(MozillaSidebarExtensionFunc)
-MozillaSidebarExtension::MozillaSidebarExtension(ExecState *exec, KHTMLPart *p)
+MozillaSidebarExtension::MozillaSidebarExtension(ExecState *exec, TDEHTMLPart *p)
: ObjectImp(exec->interpreter()->builtinObjectPrototype()), m_part(p) { }
Value MozillaSidebarExtension::get(ExecState *exec, const Identifier &propertyName) const
@@ -66,7 +66,7 @@ Value MozillaSidebarExtensionFunc::tryCall(ExecState *exec, Object &thisObj, con
KJS_CHECK_THIS( KJS::MozillaSidebarExtension, thisObj );
MozillaSidebarExtension *mse = static_cast(thisObj.imp());
- KHTMLPart *part = mse->part();
+ TDEHTMLPart *part = mse->part();
if (!part)
return Undefined();
diff --git a/tdehtml/ecma/kjs_mozilla.h b/tdehtml/ecma/kjs_mozilla.h
index 220094f63..112af1315 100644
--- a/tdehtml/ecma/kjs_mozilla.h
+++ b/tdehtml/ecma/kjs_mozilla.h
@@ -23,21 +23,21 @@
#include
-class KHTMLPart;
+class TDEHTMLPart;
namespace KJS {
class MozillaSidebarExtension : public ObjectImp {
public:
- MozillaSidebarExtension(ExecState *exec, KHTMLPart *p);
+ MozillaSidebarExtension(ExecState *exec, TDEHTMLPart *p);
virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
enum { addPanel };
- KHTMLPart *part() const { return m_part; }
+ TDEHTMLPart *part() const { return m_part; }
private:
- KHTMLPart *m_part;
+ TDEHTMLPart *m_part;
};
} // namespace
diff --git a/tdehtml/ecma/kjs_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp
index 22d5f9cb7..5934afd3e 100644
--- a/tdehtml/ecma/kjs_navigator.cpp
+++ b/tdehtml/ecma/kjs_navigator.cpp
@@ -165,7 +165,7 @@ const ClassInfo Navigator::info = { "Navigator", 0, &NavigatorTable, 0 };
*/
IMPLEMENT_PROTOFUNC_DOM(NavigatorFunc)
-Navigator::Navigator(ExecState *exec, KHTMLPart *p)
+Navigator::Navigator(ExecState *exec, TDEHTMLPart *p)
: ObjectImp(exec->interpreter()->builtinObjectPrototype()), m_part(p) { }
Value Navigator::get(ExecState *exec, const Identifier &propertyName) const
diff --git a/tdehtml/ecma/kjs_navigator.h b/tdehtml/ecma/kjs_navigator.h
index ccd1ba63b..9298b3761 100644
--- a/tdehtml/ecma/kjs_navigator.h
+++ b/tdehtml/ecma/kjs_navigator.h
@@ -23,13 +23,13 @@
#include
-class KHTMLPart;
+class TDEHTMLPart;
namespace KJS {
class Navigator : public ObjectImp {
public:
- Navigator(ExecState *exec, KHTMLPart *p);
+ Navigator(ExecState *exec, TDEHTMLPart *p);
virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
virtual const ClassInfo* classInfo() const { return &info; }
@@ -37,9 +37,9 @@ namespace KJS {
enum { AppCodeName, AppName, AppVersion, Language, UserAgent, UserLanguage, Platform,
_Plugins, _MimeTypes, Product, ProductSub, Vendor, CookieEnabled, JavaEnabled,
BrowserLanguage, CpuClass };
- KHTMLPart *part() const { return m_part; }
+ TDEHTMLPart *part() const { return m_part; }
private:
- KHTMLPart *m_part;
+ TDEHTMLPart *m_part;
};
// Hashtable enums
diff --git a/tdehtml/ecma/kjs_proxy.cpp b/tdehtml/ecma/kjs_proxy.cpp
index cc7afa00a..578cd30f0 100644
--- a/tdehtml/ecma/kjs_proxy.cpp
+++ b/tdehtml/ecma/kjs_proxy.cpp
@@ -355,7 +355,7 @@ void KJSProxyImpl::applyUserAgent()
// If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape
if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
userAgent.find(TQString::fromLatin1("compatible")) == -1 &&
- userAgent.find(TQString::fromLatin1("KHTML")) == -1)
+ userAgent.find(TQString::fromLatin1("TDEHTML")) == -1)
{
m_script->setCompatMode(Interpreter::NetscapeCompat);
#ifdef KJS_VERBOSE
@@ -365,8 +365,8 @@ void KJSProxyImpl::applyUserAgent()
}
// Helper method, so that all classes which need jScript() don't need to be added
-// as friend to KHTMLPart
-KJSProxy * KJSProxy::proxy( KHTMLPart *part )
+// as friend to TDEHTMLPart
+KJSProxy * KJSProxy::proxy( TDEHTMLPart *part )
{
return part->jScript();
}
@@ -402,7 +402,7 @@ void KJSCPUGuard::stop()
bool KJSCPUGuard::confirmTerminate() {
kdDebug(6070) << "alarmhandler" << endl;
- return KMessageBox::warningYesNo(0L, i18n("A script on this page is causing KHTML to freeze. If it continues to run, other applications may become less responsive.\nDo you want to abort the script?"), i18n("JavaScript"), i18n("&Abort"), KStdGuiItem::cont(), "kjscupguard_alarmhandler") == KMessageBox::Yes;
+ return KMessageBox::warningYesNo(0L, i18n("A script on this page is causing TDEHTML to freeze. If it continues to run, other applications may become less responsive.\nDo you want to abort the script?"), i18n("JavaScript"), i18n("&Abort"), KStdGuiItem::cont(), "kjscupguard_alarmhandler") == KMessageBox::Yes;
}
void KJSCPUGuard::alarmHandler(int) {
diff --git a/tdehtml/ecma/kjs_proxy.h b/tdehtml/ecma/kjs_proxy.h
index 5ea2d5bf6..bac9e9579 100644
--- a/tdehtml/ecma/kjs_proxy.h
+++ b/tdehtml/ecma/kjs_proxy.h
@@ -26,7 +26,7 @@
#include
#include
-class KHTMLPart;
+class TDEHTMLPart;
namespace DOM {
class Node;
@@ -72,8 +72,8 @@ public:
tdehtml::ChildFrame *m_frame;
int m_handlerLineno;
- // Helper method, to access the private KHTMLPart::jScript()
- static KJSProxy *proxy( KHTMLPart *part );
+ // Helper method, to access the private TDEHTMLPart::jScript()
+ static KJSProxy *proxy( TDEHTMLPart *part );
};
class KJSCPUGuard {
diff --git a/tdehtml/ecma/kjs_traversal.cpp b/tdehtml/ecma/kjs_traversal.cpp
index b8b9e824a..a01d469de 100644
--- a/tdehtml/ecma/kjs_traversal.cpp
+++ b/tdehtml/ecma/kjs_traversal.cpp
@@ -302,11 +302,11 @@ JSNodeFilter::~JSNodeFilter()
short JSNodeFilter::acceptNode(const DOM::Node &n)
{
- KHTMLView *view = static_cast( n.handle()->docPtr() )->view();
+ TDEHTMLView *view = static_cast( n.handle()->docPtr() )->view();
if (!view)
return DOM::NodeFilter::FILTER_REJECT;
- KHTMLPart *part = view->part();
+ TDEHTMLPart *part = view->part();
KJSProxy *proxy = part->jScript();
if (proxy) {
ExecState *exec = proxy->interpreter()->globalExec();
diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp
index 767c7607f..1d38de27e 100644
--- a/tdehtml/ecma/kjs_window.cpp
+++ b/tdehtml/ecma/kjs_window.cpp
@@ -77,7 +77,7 @@ namespace KJS {
class History : public ObjectImp {
friend class HistoryFunc;
public:
- History(ExecState *exec, KHTMLPart *p)
+ History(ExecState *exec, TDEHTMLPart *p)
: ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { }
virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
@@ -85,31 +85,31 @@ namespace KJS {
static const ClassInfo info;
enum { Back, Forward, Go, Length };
private:
- TQGuardedPtr part;
+ TQGuardedPtr part;
};
class External : public ObjectImp {
friend class ExternalFunc;
public:
- External(ExecState *exec, KHTMLPart *p)
+ External(ExecState *exec, TDEHTMLPart *p)
: ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { }
virtual Value get(ExecState *exec, const Identifier &propertyName) const;
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
enum { AddFavorite };
private:
- TQGuardedPtr part;
+ TQGuardedPtr part;
};
class FrameArray : public ObjectImp {
public:
- FrameArray(ExecState *exec, KHTMLPart *p)
+ FrameArray(ExecState *exec, TDEHTMLPart *p)
: ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { }
virtual Value get(ExecState *exec, const Identifier &propertyName) const;
virtual Value call(ExecState *exec, Object &thisObj, const List &args);
virtual bool implementsCall() const { return true; }
private:
- TQGuardedPtr part;
+ TQGuardedPtr part;
};
#ifdef Q_WS_QWS
@@ -421,7 +421,7 @@ Window *Window::retrieveWindow(KParts::ReadOnlyPart *p)
Object obj = Object::dynamicCast( retrieve( p ) );
#ifndef NDEBUG
// obj should never be null, except when javascript has been disabled in that part.
- KHTMLPart *part = ::tqqt_cast(p);
+ TDEHTMLPart *part = ::tqqt_cast(p);
if ( part && part->jScriptEnabled() )
{
assert( obj.isValid() );
@@ -448,10 +448,10 @@ Window *Window::retrieveActive(ExecState *exec)
Value Window::retrieve(KParts::ReadOnlyPart *p)
{
assert(p);
- KHTMLPart * part = ::tqqt_cast(p);
+ TDEHTMLPart * part = ::tqqt_cast(p);
KJSProxy *proxy = 0L;
if (!part) {
- part = ::tqqt_cast(p->parent());
+ part = ::tqqt_cast(p->parent());
if (part)
proxy = part->framejScript(p);
} else
@@ -478,7 +478,7 @@ Location *Window::location() const
ObjectImp* Window::frames( ExecState* exec ) const
{
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
if (part)
return m_frames ? m_frames :
(const_cast(this)->m_frames = new FrameArray(exec, part));
@@ -516,7 +516,7 @@ bool Window::hasProperty(ExecState *exec, const Identifier &p) const
if (Lookup::findEntry(&WindowTable, p))
return true;
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
if (!part)
return false;
@@ -585,7 +585,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
}
const HashEntry* entry = Lookup::findEntry(&WindowTable, p);
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
// properties that work on all windows
if (entry) {
@@ -604,7 +604,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
}
if (!part)
return Undefined();
- // KHTMLPart next
+ // TDEHTMLPart next
switch(entry->value) {
case Frames:
return Value(frames(exec));
@@ -614,9 +614,9 @@ Value Window::get(ExecState *exec, const Identifier &p) const
else // doesn't work yet
return retrieve(part->opener());
case Parent:
- return retrieve(part->parentPart() ? part->parentPart() : (KHTMLPart*)part);
+ return retrieve(part->parentPart() ? part->parentPart() : (TDEHTMLPart*)part);
case Top: {
- KHTMLPart *p = part;
+ TDEHTMLPart *p = part;
while (p->parentPart())
p = p->parentPart();
return retrieve(p);
@@ -638,7 +638,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
break;
}
} else if (!part) {
- // not a KHTMLPart
+ // not a TDEHTMLPart
TQString rvalue;
KParts::LiveConnectExtension::Type rtype;
unsigned long robjid;
@@ -948,11 +948,11 @@ Value Window::get(ExecState *exec, const Identifier &p) const
case Onchange:
return getListener(exec,DOM::EventImpl::CHANGE_EVENT);
case Onclick:
- return getListener(exec,DOM::EventImpl::KHTML_ECMA_CLICK_EVENT);
+ return getListener(exec,DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT);
case Ondblclick:
- return getListener(exec,DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT);
+ return getListener(exec,DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT);
case Ondragdrop:
- return getListener(exec,DOM::EventImpl::KHTML_DRAGDROP_EVENT);
+ return getListener(exec,DOM::EventImpl::TDEHTML_DRAGDROP_EVENT);
case Onerror:
return getListener(exec,DOM::EventImpl::ERROR_EVENT);
case Onfocus:
@@ -976,7 +976,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
case Onmouseup:
return getListener(exec,DOM::EventImpl::MOUSEUP_EVENT);
case Onmove:
- return getListener(exec,DOM::EventImpl::KHTML_MOVE_EVENT);
+ return getListener(exec,DOM::EventImpl::TDEHTML_MOVE_EVENT);
case Onreset:
return getListener(exec,DOM::EventImpl::RESET_EVENT);
case Onresize:
@@ -1085,12 +1085,12 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
default:
break;
}
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
if (part) {
switch( entry->value ) {
case Status: {
if (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host())
- == KHTMLSettings::KJSWindowStatusAllow) {
+ == TDEHTMLSettings::KJSWindowStatusAllow) {
String s = value.toString(exec);
part->setJSStatusBarText(s.value().qstring());
}
@@ -1098,7 +1098,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
}
case DefaultStatus: {
if (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host())
- == KHTMLSettings::KJSWindowStatusAllow) {
+ == TDEHTMLSettings::KJSWindowStatusAllow) {
String s = value.toString(exec);
part->setJSDefaultStatusBarText(s.value().qstring());
}
@@ -1118,15 +1118,15 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
return;
case Onclick:
if (isSafeScript(exec))
- setListener(exec,DOM::EventImpl::KHTML_ECMA_CLICK_EVENT,value);
+ setListener(exec,DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT,value);
return;
case Ondblclick:
if (isSafeScript(exec))
- setListener(exec,DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT,value);
+ setListener(exec,DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT,value);
return;
case Ondragdrop:
if (isSafeScript(exec))
- setListener(exec,DOM::EventImpl::KHTML_DRAGDROP_EVENT,value);
+ setListener(exec,DOM::EventImpl::TDEHTML_DRAGDROP_EVENT,value);
return;
case Onerror:
if (isSafeScript(exec))
@@ -1174,7 +1174,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
return;
case Onmove:
if (isSafeScript(exec))
- setListener(exec,DOM::EventImpl::KHTML_MOVE_EVENT,value);
+ setListener(exec,DOM::EventImpl::TDEHTML_MOVE_EVENT,value);
return;
case Onreset:
if (isSafeScript(exec))
@@ -1222,7 +1222,7 @@ bool Window::toBoolean(ExecState *) const
DOM::AbstractView Window::toAbstractView() const
{
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
if (!part)
return DOM::AbstractView();
return part->document().defaultView();
@@ -1240,9 +1240,9 @@ void Window::closeNow()
if (m_frame.isNull() || m_frame->m_part.isNull()) {
kdDebug(6070) << k_funcinfo << "part is deleted already" << endl;
} else {
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
if (!part) {
- kdDebug(6070) << "closeNow on non KHTML part" << endl;
+ kdDebug(6070) << "closeNow on non TDEHTML part" << endl;
} else {
//kdDebug(6070) << k_funcinfo << " -> closing window" << endl;
// We want to make sure that window.open won't find this part by name.
@@ -1288,9 +1288,9 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const
if ( activePart == m_frame->m_part ) // Not calling from another frame, no problem.
return true;
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
if (!part)
- return true; // not a KHTMLPart
+ return true; // not a TDEHTMLPart
if ( part->document().isNull() )
return true; // allow to access a window that was just created (e.g. with window.open("about:blank"))
@@ -1301,11 +1301,11 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const
return false;
}
- KHTMLPart *activeKHTMLPart = ::tqqt_cast(activePart);
- if (!activeKHTMLPart)
- return true; // not a KHTMLPart
+ TDEHTMLPart *activeTDEHTMLPart = ::tqqt_cast(activePart);
+ if (!activeTDEHTMLPart)
+ return true; // not a TDEHTMLPart
- DOM::HTMLDocument actDocument = activeKHTMLPart->htmlDocument();
+ DOM::HTMLDocument actDocument = activeTDEHTMLPart->htmlDocument();
if ( actDocument.isNull() ) {
kdDebug(6070) << "Window::isSafeScript: active part has no document!" << endl;
return false;
@@ -1327,7 +1327,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const
void Window::setListener(ExecState *exec, int eventId, Value func)
{
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
if (!part || !isSafeScript(exec))
return;
DOM::DocumentImpl *doc = static_cast(part->htmlDocument().handle());
@@ -1339,7 +1339,7 @@ void Window::setListener(ExecState *exec, int eventId, Value func)
Value Window::getListener(ExecState *exec, int eventId) const
{
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
if (!part || !isSafeScript(exec))
return Undefined();
DOM::DocumentImpl *doc = static_cast(part->htmlDocument().handle());
@@ -1357,7 +1357,7 @@ Value Window::getListener(ExecState *exec, int eventId) const
JSEventListener *Window::getJSEventListener(const Value& val, bool html)
{
// This function is so hot that it's worth coding it directly with imps.
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
if (!part || val.type() != ObjectType)
return 0;
@@ -1433,8 +1433,8 @@ void Window::setCurrentEvent( DOM::Event *evt )
void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory)
{
Window* active = Window::retrieveActive(exec);
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
- KHTMLPart *active_part = ::tqqt_cast(active->part());
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *active_part = ::tqqt_cast(active->part());
// Complete the URL using the "active part" (running interpreter)
if (active_part && part) {
if (url[0] == TQChar('#')) {
@@ -1470,7 +1470,7 @@ void Window::delayedGoHistory( int steps )
void Window::goHistory( int steps )
{
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
if(!part)
// TODO history readonlypart
return;
@@ -1488,7 +1488,7 @@ void Window::goHistory( int steps )
void KJS::Window::resizeTo(TQWidget* tl, int width, int height)
{
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
if(!part)
// TODO resizeTo readonlypart
return;
@@ -1531,10 +1531,10 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height)
Value Window::openWindow(ExecState *exec, const List& args)
{
- KHTMLPart *part = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part);
if (!part)
return Undefined();
- KHTMLView *widget = part->view();
+ TDEHTMLView *widget = part->view();
Value v = args[0];
TQString str;
if (v.isValid() && !v.isA(UndefinedType))
@@ -1544,7 +1544,7 @@ Value Window::openWindow(ExecState *exec, const List& args)
KURL url;
if (!str.isEmpty())
{
- KHTMLPart* p = ::tqqt_cast(Window::retrieveActive(exec)->m_frame->m_part);
+ TDEHTMLPart* p = ::tqqt_cast(Window::retrieveActive(exec)->m_frame->m_part);
if ( p )
url = p->htmlDocument().completeURL(str).string();
if ( !p ||
@@ -1552,9 +1552,9 @@ Value Window::openWindow(ExecState *exec, const List& args)
return Undefined();
}
- KHTMLSettings::KJSWindowOpenPolicy policy =
+ TDEHTMLSettings::KJSWindowOpenPolicy policy =
part->settings()->windowOpenPolicy(part->url().host());
- if ( policy == KHTMLSettings::KJSWindowOpenAsk ) {
+ if ( policy == TDEHTMLSettings::KJSWindowOpenAsk ) {
emit part->browserExtension()->requestFocus(part);
TQString caption;
if (!part->url().host().isEmpty())
@@ -1568,12 +1568,12 @@ Value Window::openWindow(ExecState *exec, const List& args)
i18n( "This site is requesting to open%1
in a new browser window via JavaScript.
"
"Do you want to allow this?").arg(KStringHandler::csqueeze(url.htmlURL(), 100)),
caption, i18n("Allow"), i18n("Do Not Allow") ) == KMessageBox::Yes )
- policy = KHTMLSettings::KJSWindowOpenAllow;
- } else if ( policy == KHTMLSettings::KJSWindowOpenSmart )
+ policy = TDEHTMLSettings::KJSWindowOpenAllow;
+ } else if ( policy == TDEHTMLSettings::KJSWindowOpenSmart )
{
// window.open disabled unless from a key/mouse event
if (static_cast(exec->interpreter())->isWindowOpenAllowed())
- policy = KHTMLSettings::KJSWindowOpenAllow;
+ policy = TDEHTMLSettings::KJSWindowOpenAllow;
}
TQString frameName = args.size() > 1 ? args[1].toString(exec).qstring() : TQString("_blank");
@@ -1587,7 +1587,7 @@ Value Window::openWindow(ExecState *exec, const List& args)
features = features.mid(1, features.length()-2);
}
- if ( policy != KHTMLSettings::KJSWindowOpenAllow ) {
+ if ( policy != TDEHTMLSettings::KJSWindowOpenAllow ) {
if ( url.isEmpty() )
part->setSuppressedPopupIndicator(true, 0);
else {
@@ -1602,8 +1602,8 @@ Value Window::openWindow(ExecState *exec, const List& args)
Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString& frameName, const TQString& features)
{
- KHTMLPart *p = ::tqqt_cast(m_frame->m_part);
- KHTMLView *widget = p->view();
+ TDEHTMLPart *p = ::tqqt_cast(m_frame->m_part);
+ TDEHTMLView *widget = p->view();
KParts::WindowArgs winargs;
// scan feature argument
@@ -1703,8 +1703,8 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
// request window (new or existing if framename is set)
KParts::ReadOnlyPart *newPart = 0L;
emit p->browserExtension()->createNewWindow(KURL(), uargs,winargs,newPart);
- if (newPart && ::tqqt_cast(newPart)) {
- KHTMLPart *tdehtmlpart = static_cast(newPart);
+ if (newPart && ::tqqt_cast(newPart)) {
+ TDEHTMLPart *tdehtmlpart = static_cast(newPart);
//tqDebug("opener set to %p (this Window's part) in new Window %p (this Window=%p)",part,win,window);
tdehtmlpart->setOpener(p);
tdehtmlpart->setOpenedByJS(true);
@@ -1735,7 +1735,7 @@ void Window::forgetSuppressedWindows()
void Window::showSuppressedWindows()
{
- KHTMLPart *part = ::tqqt_cast( m_frame->m_part );
+ TDEHTMLPart *part = ::tqqt_cast( m_frame->m_part );
KJS::Interpreter *interpreter = part->jScript()->interpreter();
ExecState *exec = interpreter->globalExec();
@@ -1760,11 +1760,11 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
Window *window = static_cast(thisObj.imp());
TQString str, str2;
- KHTMLPart *part = ::tqqt_cast(window->m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(window->m_frame->m_part);
if (!part)
return Undefined();
- KHTMLView *widget = part->view();
+ TDEHTMLView *widget = part->view();
Value v = args[0];
UString s;
if (v.isValid() && !v.isA(UndefinedType)) {
@@ -1894,9 +1894,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
window->goURL(exec, args[0].toString(exec).qstring(), false /*don't lock history*/);
return Undefined();
case Window::Focus: {
- KHTMLSettings::KJSWindowFocusPolicy policy =
+ TDEHTMLSettings::KJSWindowFocusPolicy policy =
part->settings()->windowFocusPolicy(part->url().host());
- if(policy == KHTMLSettings::KJSWindowFocusAllow && widget) {
+ if(policy == TDEHTMLSettings::KJSWindowFocusAllow && widget) {
widget->topLevelWidget()->raise();
KWin::deIconifyWindow( widget->topLevelWidget()->winId() );
widget->setActiveWindow();
@@ -1944,9 +1944,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
widget->setContentsPos(args[0].toInt32(exec), args[1].toInt32(exec));
return Undefined();
case Window::MoveBy: {
- KHTMLSettings::KJSWindowMovePolicy policy =
+ TDEHTMLSettings::KJSWindowMovePolicy policy =
part->settings()->windowMovePolicy(part->url().host());
- if(policy == KHTMLSettings::KJSWindowMoveAllow && args.size() == 2 && widget)
+ if(policy == TDEHTMLSettings::KJSWindowMoveAllow && args.size() == 2 && widget)
{
KParts::BrowserExtension *ext = part->browserExtension();
if (ext) {
@@ -1964,9 +1964,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
return Undefined();
}
case Window::MoveTo: {
- KHTMLSettings::KJSWindowMovePolicy policy =
+ TDEHTMLSettings::KJSWindowMovePolicy policy =
part->settings()->windowMovePolicy(part->url().host());
- if(policy == KHTMLSettings::KJSWindowMoveAllow && args.size() == 2 && widget)
+ if(policy == TDEHTMLSettings::KJSWindowMoveAllow && args.size() == 2 && widget)
{
KParts::BrowserExtension *ext = part->browserExtension();
if (ext) {
@@ -1984,9 +1984,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
return Undefined();
}
case Window::ResizeBy: {
- KHTMLSettings::KJSWindowResizePolicy policy =
+ TDEHTMLSettings::KJSWindowResizePolicy policy =
part->settings()->windowResizePolicy(part->url().host());
- if(policy == KHTMLSettings::KJSWindowResizeAllow
+ if(policy == TDEHTMLSettings::KJSWindowResizeAllow
&& args.size() == 2 && widget)
{
TQWidget * tl = widget->topLevelWidget();
@@ -1998,9 +1998,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
return Undefined();
}
case Window::ResizeTo: {
- KHTMLSettings::KJSWindowResizePolicy policy =
+ TDEHTMLSettings::KJSWindowResizePolicy policy =
part->settings()->windowResizePolicy(part->url().host());
- if(policy == KHTMLSettings::KJSWindowResizeAllow
+ if(policy == TDEHTMLSettings::KJSWindowResizeAllow
&& args.size() == 2 && widget)
{
TQWidget * tl = widget->topLevelWidget();
@@ -2114,7 +2114,7 @@ ScheduledAction::ScheduledAction(TQString _code, DateTimeMS _nextTime, int _inte
bool ScheduledAction::execute(Window *window)
{
- KHTMLPart *part = ::tqqt_cast(window->m_frame->m_part);
+ TDEHTMLPart *part = ::tqqt_cast(window->m_frame->m_part);
if (!part || !part->jScriptEnabled())
return false;
ScriptInterpreter *interpreter = static_cast(part->jScript()->interpreter());
@@ -2432,7 +2432,7 @@ Value FrameArray::get(ExecState *exec, const Identifier &p) const
if (node) {
if (node->id() == ID_FRAME || node->id() == ID_IFRAME) {
//Return the Window object.
- KHTMLPart* part = static_cast(node)->contentPart();
+ TDEHTMLPart* part = static_cast(node)->contentPart();
if (part)
return Value(Window::retrieveWindow(part));
else
@@ -2590,7 +2590,7 @@ void Location::put(ExecState *exec, const Identifier &p, const Value &v, int att
TQString str = v.toString(exec).qstring();
switch (entry->value) {
case Href: {
- KHTMLPart* p =::tqqt_cast(Window::retrieveActive(exec)->part());
+ TDEHTMLPart* p =::tqqt_cast(Window::retrieveActive(exec)->part());
if ( p )
url = p->htmlDocument().completeURL( str ).string();
else
@@ -2681,7 +2681,7 @@ Value LocationFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
id == Location::Replace);
break;
case Location::Reload: {
- KHTMLPart *tdehtmlpart = ::tqqt_cast(part);
+ TDEHTMLPart *tdehtmlpart = ::tqqt_cast(part);
if (tdehtmlpart)
tdehtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/);
else
@@ -2714,11 +2714,11 @@ Value ExternalFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
KJS_CHECK_THIS( External, thisObj );
External *external = static_cast(thisObj.imp());
- KHTMLPart *part = external->part;
+ TDEHTMLPart *part = external->part;
if (!part)
return Undefined();
- KHTMLView *widget = part->view();
+ TDEHTMLView *widget = part->view();
switch (id) {
case External::AddFavorite:
diff --git a/tdehtml/ecma/kjs_window.h b/tdehtml/ecma/kjs_window.h
index b9142f983..c30871692 100644
--- a/tdehtml/ecma/kjs_window.h
+++ b/tdehtml/ecma/kjs_window.h
@@ -32,8 +32,8 @@
#include "kjs_views.h"
class TQTimer;
-class KHTMLView;
-class KHTMLPart;
+class TDEHTMLView;
+class TDEHTMLPart;
namespace KParts {
class ReadOnlyPart;
@@ -64,13 +64,13 @@ namespace KJS {
virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
private:
- KHTMLView *view;
+ TDEHTMLView *view;
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
};
class KDE_EXPORT Window : public ObjectImp {
- friend TQGuardedPtr getInstance();
+ friend TQGuardedPtr getInstance();
friend class Location;
friend class WindowFunc;
friend class WindowQObject;
@@ -293,14 +293,14 @@ namespace KJS {
class Konqueror : public ObjectImp {
friend class KonquerorFunc;
public:
- Konqueror(KHTMLPart *p) : part(p) { }
+ Konqueror(TDEHTMLPart *p) : part(p) { }
virtual Value get(ExecState *exec, const Identifier &propertyName) const;
virtual bool hasProperty(ExecState *exec, const Identifier &p) const;
virtual UString toString(ExecState *exec) const;
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
private:
- KHTMLPart *part;
+ TDEHTMLPart *part;
};
#endif
diff --git a/tdehtml/ecma/testecma.cpp b/tdehtml/ecma/testecma.cpp
index 44cd7ecb0..3bd4bb88d 100644
--- a/tdehtml/ecma/testecma.cpp
+++ b/tdehtml/ecma/testecma.cpp
@@ -19,7 +19,7 @@
/**
* An interactive interpreter to test the ECMA Script language bindings
- * for the DOM of KHTML.
+ * for the DOM of TDEHTML.
* The 'document' property is preset to an instance of Document and serves
* as an entrypoint.
*
diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp
index bfaa91231..d95fe5e58 100644
--- a/tdehtml/ecma/xmlhttprequest.cpp
+++ b/tdehtml/ecma/xmlhttprequest.cpp
@@ -725,7 +725,7 @@ Value XMLHttpRequestProtoFunc::tryCall(ExecState *exec, Object &thisObj, const L
}
TQString method = args[0].toString(exec).qstring();
- KHTMLPart *part = ::tqqt_cast(Window::retrieveActive(exec)->part());
+ TDEHTMLPart *part = ::tqqt_cast(Window::retrieveActive(exec)->part());
if (!part)
return Undefined();
KURL url = KURL(part->document().completeURL(args[1].toString(exec).qstring()).string());
diff --git a/tdehtml/html/html_baseimpl.cpp b/tdehtml/html/html_baseimpl.cpp
index 7ac3d93c9..16ca7a23b 100644
--- a/tdehtml/html/html_baseimpl.cpp
+++ b/tdehtml/html/html_baseimpl.cpp
@@ -85,7 +85,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr)
break;
}
case ATTR_MARGINWIDTH: {
- KHTMLView* w = getDocument()->view();
+ TDEHTMLView* w = getDocument()->view();
if (w)
w->setMarginWidth( -1 ); // unset this, so it doesn't override the setting here
addCSSLength(CSS_PROP_MARGIN_RIGHT, attr->value() );
@@ -95,7 +95,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr)
addCSSLength(CSS_PROP_MARGIN_LEFT, attr->value() );
break;
case ATTR_MARGINHEIGHT: {
- KHTMLView* w = getDocument()->view();
+ TDEHTMLView* w = getDocument()->view();
if (w)
w->setMarginHeight( -1 ); // unset this, so it doesn't override the setting here
addCSSLength(CSS_PROP_MARGIN_BOTTOM, attr->value());
@@ -185,7 +185,7 @@ void HTMLBodyElementImpl::insertedIntoDocument()
{
HTMLElementImpl::insertedIntoDocument();
- KHTMLView* w = getDocument()->view();
+ TDEHTMLView* w = getDocument()->view();
if(w && w->marginWidth() != -1) {
TQString s;
s.sprintf( "%d", w->marginWidth() );
@@ -351,7 +351,7 @@ void HTMLFrameElementImpl::attach()
if (!m_render)
return;
- KHTMLView* w = getDocument()->view();
+ TDEHTMLView* w = getDocument()->view();
if (w) {
// we need a unique name for every frame in the frameset. Hope that's unique enough.
if(name.isEmpty() || w->part()->frameExists( name.string() ) )
@@ -380,9 +380,9 @@ void HTMLFrameElementImpl::setLocation( const DOMString& str )
return;
// load the frame contents
- KHTMLView *w = getDocument()->view();
+ TDEHTMLView *w = getDocument()->view();
if (w) {
- KHTMLPart *part = w->part()->findFrame( name.string() );
+ TDEHTMLPart *part = w->part()->findFrame( name.string() );
if ( part ) {
part->openURL( KURL( getDocument()->completeURL( url.string() ) ) );
} else {
@@ -414,20 +414,20 @@ DocumentImpl* HTMLFrameElementImpl::contentDocument() const
RenderPart* render = static_cast( m_render );
- if(render->widget() && ::tqqt_cast( render->widget()) )
- return static_cast( render->widget() )->part()->xmlDocImpl();
+ if(render->widget() && ::tqqt_cast( render->widget()) )
+ return static_cast( render->widget() )->part()->xmlDocImpl();
return 0;
}
-KHTMLPart* HTMLFrameElementImpl::contentPart() const
+TDEHTMLPart* HTMLFrameElementImpl::contentPart() const
{
if ( !m_render ) return 0;
RenderPart* render = static_cast( m_render );
- if(render->widget() && ::tqqt_cast( render->widget()) )
- return static_cast( render->widget() )->part();
+ if(render->widget() && ::tqqt_cast( render->widget()) )
+ return static_cast( render->widget() )->part();
return 0;
}
@@ -688,7 +688,7 @@ void HTMLIFrameElementImpl::attach()
if (m_render) {
// we need a unique name for every frame in the frameset. Hope that's unique enough.
- KHTMLView* w = getDocument()->view();
+ TDEHTMLView* w = getDocument()->view();
if(w && (name.isEmpty() || w->part()->frameExists( name.string() )))
name = DOMString(w->part()->requestFrameName());
diff --git a/tdehtml/html/html_baseimpl.h b/tdehtml/html/html_baseimpl.h
index 0aff3e8e1..8d7205732 100644
--- a/tdehtml/html/html_baseimpl.h
+++ b/tdehtml/html/html_baseimpl.h
@@ -33,8 +33,8 @@
#include
-class KHTMLView;
-class KHTMLPart;
+class TDEHTMLView;
+class TDEHTMLPart;
namespace tdehtml {
class RenderFrameSet;
@@ -96,7 +96,7 @@ public:
virtual void setFocus(bool);
DocumentImpl* contentDocument() const;
- KHTMLPart* contentPart() const;
+ TDEHTMLPart* contentPart() const;
DOMString url;
DOMString name;
diff --git a/tdehtml/html/html_blockimpl.cpp b/tdehtml/html/html_blockimpl.cpp
index 3e4585c41..47ceaa9fa 100644
--- a/tdehtml/html/html_blockimpl.cpp
+++ b/tdehtml/html/html_blockimpl.cpp
@@ -45,11 +45,11 @@ void HTMLDivElementImpl::parseAttribute(AttributeImpl *attr)
{
DOMString v = attr->value().lower();
if ( strcmp( v, "middle" ) == 0 || strcmp( v, "center" ) == 0 )
- addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_CENTER);
else if (strcmp(v, "left") == 0)
- addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_LEFT);
else if (strcmp(v, "right") == 0)
- addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_RIGHT);
else
addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
break;
@@ -214,37 +214,37 @@ void HTMLMarqueeElementImpl::parseAttribute(AttributeImpl *attr)
break;
case ATTR_SCROLLAMOUNT:
if (!attr->value().isEmpty())
- addCSSLength(CSS_PROP__KHTML_MARQUEE_INCREMENT, attr->value());
+ addCSSLength(CSS_PROP__TDEHTML_MARQUEE_INCREMENT, attr->value());
else
- removeCSSProperty(CSS_PROP__KHTML_MARQUEE_INCREMENT);
+ removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_INCREMENT);
break;
case ATTR_SCROLLDELAY:
if (!attr->value().isEmpty())
- addCSSLength(CSS_PROP__KHTML_MARQUEE_SPEED, attr->value(), true);
+ addCSSLength(CSS_PROP__TDEHTML_MARQUEE_SPEED, attr->value(), true);
else
- removeCSSProperty(CSS_PROP__KHTML_MARQUEE_SPEED);
+ removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_SPEED);
break;
case ATTR_LOOP:
if (!attr->value().isEmpty()) {
if (attr->value() == "-1" || strcasecmp(attr->value(), "infinite") == 0)
- addCSSProperty(CSS_PROP__KHTML_MARQUEE_REPETITION, CSS_VAL_INFINITE);
+ addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_REPETITION, CSS_VAL_INFINITE);
else
- addCSSLength(CSS_PROP__KHTML_MARQUEE_REPETITION, attr->value().lower(), true);
+ addCSSLength(CSS_PROP__TDEHTML_MARQUEE_REPETITION, attr->value().lower(), true);
}
else
- removeCSSProperty(CSS_PROP__KHTML_MARQUEE_REPETITION);
+ removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_REPETITION);
break;
case ATTR_BEHAVIOR:
if (!attr->value().isEmpty())
- addCSSProperty(CSS_PROP__KHTML_MARQUEE_STYLE, attr->value().lower());
+ addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_STYLE, attr->value().lower());
else
- removeCSSProperty(CSS_PROP__KHTML_MARQUEE_STYLE);
+ removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_STYLE);
break;
case ATTR_DIRECTION:
if (!attr->value().isEmpty())
- addCSSProperty(CSS_PROP__KHTML_MARQUEE_DIRECTION, attr->value().lower());
+ addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_DIRECTION, attr->value().lower());
else
- removeCSSProperty(CSS_PROP__KHTML_MARQUEE_DIRECTION);
+ removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_DIRECTION);
break;
case ATTR_TRUESPEED:
m_minimumDelay = attr->val() ? 0 : defaultMinimumDelay;
diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp
index 3aa70c196..21c3e12c5 100644
--- a/tdehtml/html/html_documentimpl.cpp
+++ b/tdehtml/html/html_documentimpl.cpp
@@ -69,7 +69,7 @@ using namespace DOM;
using namespace tdehtml;
-HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
+HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v)
: DocumentImpl(_implementation, v)
{
// kdDebug( 6090 ) << "HTMLDocumentImpl constructor this = " << this << endl;
@@ -78,12 +78,12 @@ HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTML
m_doAutoFill = false;
/* dynamic history stuff to be fixed later (pfeiffer)
- connect( KHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )),
+ connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )),
TQT_SLOT( slotHistoryChanged() ));
*/
- connect( KHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ),
+ connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ),
TQT_SLOT( slotHistoryChanged() ));
- connect( KHTMLFactory::vLinks(), TQT_SIGNAL( cleared()),
+ connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( cleared()),
TQT_SLOT( slotHistoryChanged() ));
}
@@ -108,7 +108,7 @@ DOMString HTMLDocumentImpl::lastModified() const
DOMString HTMLDocumentImpl::cookie() const
{
long windowId = 0;
- KHTMLView *v = view ();
+ TDEHTMLView *v = view ();
if ( v && v->topLevelWidget() )
windowId = v->topLevelWidget()->winId();
@@ -140,7 +140,7 @@ DOMString HTMLDocumentImpl::cookie() const
void HTMLDocumentImpl::setCookie( const DOMString & value )
{
long windowId = 0;
- KHTMLView *v = view ();
+ TDEHTMLView *v = view ();
if ( v && v->topLevelWidget() )
windowId = v->topLevelWidget()->winId();
diff --git a/tdehtml/html/html_documentimpl.h b/tdehtml/html/html_documentimpl.h
index 0aea47b8b..92f163076 100644
--- a/tdehtml/html/html_documentimpl.h
+++ b/tdehtml/html/html_documentimpl.h
@@ -29,7 +29,7 @@
#include
-class KHTMLView;
+class TDEHTMLView;
class TQString;
namespace DOM {
@@ -45,7 +45,7 @@ class HTMLDocumentImpl : public DOM::DocumentImpl
{
Q_OBJECT
public:
- HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v = 0);
+ HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v = 0);
~HTMLDocumentImpl();
virtual bool isHTMLDocument() const { return true; }
diff --git a/tdehtml/html/html_elementimpl.cpp b/tdehtml/html/html_elementimpl.cpp
index c18f19ea0..1d7995501 100644
--- a/tdehtml/html/html_elementimpl.cpp
+++ b/tdehtml/html/html_elementimpl.cpp
@@ -212,11 +212,11 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr)
break;
// standard events
case ATTR_ONCLICK:
- setHTMLEventListener(EventImpl::KHTML_ECMA_CLICK_EVENT,
+ setHTMLEventListener(EventImpl::TDEHTML_ECMA_CLICK_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onclick", this));
break;
case ATTR_ONDBLCLICK:
- setHTMLEventListener(EventImpl::KHTML_ECMA_DBLCLICK_EVENT,
+ setHTMLEventListener(EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "ondblclick", this));
break;
case ATTR_ONMOUSEDOWN:
@@ -640,7 +640,7 @@ void HTMLElementImpl::addHTMLAlignment( DOMString alignment )
} else if ( strcasecmp( alignment, "top" ) == 0 ) {
propvalign = CSS_VAL_TOP;
} else if ( strcasecmp( alignment, "middle" ) == 0 ) {
- propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE;
+ propvalign = CSS_VAL__TDEHTML_BASELINE_MIDDLE;
} else if ( strcasecmp( alignment, "center" ) == 0 ) {
propvalign = CSS_VAL_MIDDLE;
} else if ( strcasecmp( alignment, "bottom" ) == 0 ) {
diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index 7e2776ad5..3f8384a97 100644
--- a/tdehtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -53,7 +53,7 @@
#include
#include
#include
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
#include
#endif
#include
@@ -223,7 +223,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
for(unsigned int i=0; i < strLength; ++i) if(str[i].latin1() == ',') str[i] = space;
const TQStringList charsets = TQStringList::split(' ', str);
TQTextCodec* codec = 0;
- KHTMLView *view = getDocument()->view();
+ TDEHTMLView *view = getDocument()->view();
{
TQStringList::ConstIterator it = charsets.begin();
const TQStringList::ConstIterator itEnd = charsets.end();
@@ -425,7 +425,7 @@ static TQString calculateAutoFillKey(const HTMLFormElementImpl& e)
void HTMLFormElementImpl::doAutoFill()
{
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
const TQString key = calculateAutoFillKey(*this);
if (KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
@@ -435,12 +435,12 @@ void HTMLFormElementImpl::doAutoFill()
// assert(view())
getDocument()->view()->part()->openWallet(this);
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
}
void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) {
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
assert(w);
const TQString key = calculateAutoFillKey(*this);
if (!w->hasFolder(KWallet::Wallet::FormDataFolder())) {
@@ -463,7 +463,7 @@ void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) {
}
}
}
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
}
void HTMLFormElementImpl::submitFromKeyboard()
@@ -505,8 +505,8 @@ void HTMLFormElementImpl::submitFromKeyboard()
void HTMLFormElementImpl::gatherWalletData()
{
-#ifndef KHTML_NO_WALLET
- KHTMLView* const view = getDocument()->view();
+#ifndef TDEHTML_NO_WALLET
+ TDEHTMLView* const view = getDocument()->view();
// check if we have any password input's
m_walletMap.clear();
m_havePassword = false;
@@ -529,13 +529,13 @@ void HTMLFormElementImpl::gatherWalletData()
m_haveTextarea = true;
}
}
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
}
bool HTMLFormElementImpl::prepareSubmit()
{
- KHTMLView* const view = getDocument()->view();
+ TDEHTMLView* const view = getDocument()->view();
if(m_insubmit || !view || !view->part() || view->part()->onlyLocalReferences())
return m_insubmit;
@@ -569,7 +569,7 @@ void HTMLFormElementImpl::submit( )
#endif
bool ok;
- KHTMLView* const view = getDocument()->view();
+ TDEHTMLView* const view = getDocument()->view();
const TQByteArray form_data = formData(ok);
const KURL formUrl(getDocument()->URL());
@@ -577,7 +577,7 @@ void HTMLFormElementImpl::submit( )
if (m_walletMap.isEmpty()) {
gatherWalletData();
}
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
if (m_havePassword && !m_haveTextarea && KWallet::Wallet::isEnabled()) {
const TQString key = calculateAutoFillKey(*this);
const bool doesnotexist = KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::FormDataFolder(), key);
@@ -630,7 +630,7 @@ void HTMLFormElementImpl::submit( )
}
}
}
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
const DOMString url(tdehtml::parseURL(getAttribute(ATTR_ACTION)));
if(m_post) {
@@ -652,7 +652,7 @@ void HTMLFormElementImpl::submit( )
void HTMLFormElementImpl::reset( )
{
- KHTMLView* const view = getDocument()->view();
+ TDEHTMLView* const view = getDocument()->view();
if(m_inreset || !view || !view->part()) return;
m_inreset = true;
@@ -991,9 +991,9 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
if (evt->target()==this && !m_disabled)
{
// Report focus in/out changes to the browser extension (editable widgets only)
- KHTMLView* const view = getDocument()->view();
+ TDEHTMLView* const view = getDocument()->view();
if (view && evt->id() == EventImpl::DOMFOCUSIN_EVENT && isEditable() && m_render && m_render->isWidget()) {
- KHTMLPartBrowserExtension *ext = static_cast(view->part()->browserExtension());
+ TDEHTMLPartBrowserExtension *ext = static_cast(view->part()->browserExtension());
TQWidget* const widget = static_cast(m_render)->widget();
if (ext)
ext->editableWidgetFocused(widget);
@@ -1038,7 +1038,7 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
if (view && evt->id() == EventImpl::DOMFOCUSOUT_EVENT && isEditable() && m_render && m_render->isWidget()) {
- KHTMLPartBrowserExtension* const ext = static_cast(view->part()->browserExtension());
+ TDEHTMLPartBrowserExtension* const ext = static_cast(view->part()->browserExtension());
TQWidget* const widget = static_cast(m_render)->widget();
if (ext)
ext->editableWidgetBlurred(widget);
@@ -1772,7 +1772,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt)
m_render->absolutePosition(offsetX,offsetY);
xPos = me->clientX()-offsetX;
yPos = me->clientY()-offsetY;
- KHTMLView* v = getDocument()->view();
+ TDEHTMLView* v = getDocument()->view();
if ( v ) {
xPos += v->contentsX();
yPos += v->contentsY();
diff --git a/tdehtml/html/html_formimpl.h b/tdehtml/html/html_formimpl.h
index 6a909368a..8fe0ef1dd 100644
--- a/tdehtml/html/html_formimpl.h
+++ b/tdehtml/html/html_formimpl.h
@@ -34,7 +34,7 @@
#include
#include
-class KHTMLView;
+class TDEHTMLView;
class TQTextCodec;
namespace tdehtml
diff --git a/tdehtml/html/html_headimpl.cpp b/tdehtml/html/html_headimpl.cpp
index 2bc0ae99f..347f8c262 100644
--- a/tdehtml/html/html_headimpl.cpp
+++ b/tdehtml/html/html_headimpl.cpp
@@ -175,7 +175,7 @@ void HTMLLinkElementImpl::process()
TQString type = getAttribute(ATTR_TYPE).string().lower();
TQString rel = getAttribute(ATTR_REL).string().lower();
- KHTMLPart* part = getDocument()->view() ? getDocument()->view()->part() : 0;
+ TDEHTMLPart* part = getDocument()->view() ? getDocument()->view()->part() : 0;
// IE extension: location of small icon for locationbar / bookmarks
// Uses both "shortcut icon" and "icon"
@@ -408,7 +408,7 @@ void HTMLScriptElementImpl::evaluateScript(const TQString &URL, const DOMString
if (m_evaluated)
return;
- KHTMLPart *part = getDocument()->part();
+ TDEHTMLPart *part = getDocument()->part();
if (part) {
KJSProxy *proxy = KJSProxy::proxy(part);
if (proxy) {
diff --git a/tdehtml/html/html_headimpl.h b/tdehtml/html/html_headimpl.h
index ee9c2ad8b..8563de6a8 100644
--- a/tdehtml/html/html_headimpl.h
+++ b/tdehtml/html/html_headimpl.h
@@ -28,7 +28,7 @@
#include "misc/loader_client.h"
#include "css/css_stylesheetimpl.h"
-class KHTMLView;
+class TDEHTMLView;
namespace tdehtml {
class CachedCSSStyleSheet;
diff --git a/tdehtml/html/html_inlineimpl.cpp b/tdehtml/html/html_inlineimpl.cpp
index 829b10f7b..f403a2385 100644
--- a/tdehtml/html/html_inlineimpl.cpp
+++ b/tdehtml/html/html_inlineimpl.cpp
@@ -98,7 +98,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
tdehtml::RenderImage *r = static_cast(img->renderer());
if(r && e)
{
- KHTMLView* v = getDocument()->view();
+ TDEHTMLView* v = getDocument()->view();
int x = e->clientX();
int y = e->clientY();
int absx = 0;
@@ -276,7 +276,7 @@ void HTMLFontElementImpl::parseAttribute(AttributeImpl *attr)
case 6: size = CSS_VAL_XX_LARGE; break;
default:
if (num > 6)
- size = CSS_VAL__KHTML_XXX_LARGE;
+ size = CSS_VAL__TDEHTML_XXX_LARGE;
else
size = CSS_VAL_XX_SMALL;
}
diff --git a/tdehtml/html/html_objectimpl.cpp b/tdehtml/html/html_objectimpl.cpp
index b224ad687..f2cf8c1db 100644
--- a/tdehtml/html/html_objectimpl.cpp
+++ b/tdehtml/html/html_objectimpl.cpp
@@ -265,7 +265,7 @@ void HTMLAppletElementImpl::parseAttribute(AttributeImpl *attr)
void HTMLAppletElementImpl::attach()
{
- KHTMLView* w = getDocument()->view();
+ TDEHTMLView* w = getDocument()->view();
#ifndef Q_WS_QWS // FIXME?
DOMString codeBase = getAttribute( ATTR_CODEBASE );
@@ -346,7 +346,7 @@ void HTMLEmbedElementImpl::parseAttribute(AttributeImpl *attr)
void HTMLEmbedElementImpl::attach()
{
- KHTMLView* w = getDocument()->view();
+ TDEHTMLView* w = getDocument()->view();
if (!w || !w->part()->pluginsEnabled())
m_renderAlternative = true;
@@ -422,14 +422,14 @@ DocumentImpl* HTMLObjectElementImpl::contentDocument() const
if ( !m_render ) return 0;
if ( !m_render->isWidget() ) return 0;
TQWidget* widget = static_cast( m_render )->widget();
- if( widget && ::tqqt_cast( widget ) )
- return static_cast( widget )->part()->xmlDocImpl();
+ if( widget && ::tqqt_cast( widget ) )
+ return static_cast( widget )->part()->xmlDocImpl();
return 0;
}
void HTMLObjectElementImpl::attach()
{
- KHTMLView* w = getDocument()->view();
+ TDEHTMLView* w = getDocument()->view();
if (!w || !w->part()->pluginsEnabled())
m_renderAlternative = true;
diff --git a/tdehtml/html/html_objectimpl.h b/tdehtml/html/html_objectimpl.h
index cc91935ca..d10e66356 100644
--- a/tdehtml/html/html_objectimpl.h
+++ b/tdehtml/html/html_objectimpl.h
@@ -28,7 +28,7 @@
#include
#include
-class KHTMLView;
+class TDEHTMLView;
// -------------------------------------------------------------------------
namespace DOM {
diff --git a/tdehtml/html/html_tableimpl.cpp b/tdehtml/html/html_tableimpl.cpp
index 3fc4ba757..71fe14773 100644
--- a/tdehtml/html/html_tableimpl.cpp
+++ b/tdehtml/html/html_tableimpl.cpp
@@ -63,7 +63,7 @@ HTMLTableElementImpl::HTMLTableElementImpl(DocumentImpl *doc)
// only difference to 100% correct is that in strict mode elements are propagated into tables.
if ( getDocument()->parseMode() < DocumentImpl::Transitional ) {
addCSSProperty( CSS_PROP_FONT_SIZE, CSS_VAL_MEDIUM );
- addCSSProperty( CSS_PROP_COLOR, CSS_VAL__KHTML_TEXT );
+ addCSSProperty( CSS_PROP_COLOR, CSS_VAL__TDEHTML_TEXT );
}
}
@@ -627,13 +627,13 @@ void HTMLTablePartElementImpl::parseAttribute(AttributeImpl *attr)
{
DOMString v = attr->value();
if ( strcasecmp( attr->value(), "middle" ) == 0 || strcasecmp( attr->value(), "center" ) == 0 )
- addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_CENTER);
else if (strcasecmp(attr->value(), "absmiddle") == 0)
addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL_CENTER);
else if (strcasecmp(attr->value(), "left") == 0)
- addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_LEFT);
else if (strcasecmp(attr->value(), "right") == 0)
- addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_RIGHT);
else
addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
break;
@@ -881,7 +881,7 @@ void HTMLTableCellElementImpl::parseAttribute(AttributeImpl *attr)
break;
case ATTR_NOWRAP:
if (attr->val() != 0)
- addCSSProperty(CSS_PROP_WHITE_SPACE, CSS_VAL__KHTML_NOWRAP);
+ addCSSProperty(CSS_PROP_WHITE_SPACE, CSS_VAL__TDEHTML_NOWRAP);
else
removeCSSProperty(CSS_PROP_WHITE_SPACE);
break;
diff --git a/tdehtml/html/htmlparser.cpp b/tdehtml/html/htmlparser.cpp
index 144a9addd..f7cc1daaf 100644
--- a/tdehtml/html/htmlparser.cpp
+++ b/tdehtml/html/htmlparser.cpp
@@ -125,7 +125,7 @@ public:
*
*/
-KHTMLParser::KHTMLParser( KHTMLView *_parent, DocumentImpl *doc)
+TDEHTMLParser::TDEHTMLParser( TDEHTMLView *_parent, DocumentImpl *doc)
{
//kdDebug( 6035 ) << "parser constructor" << endl;
#if SPEED_DEBUG > 0
@@ -144,7 +144,7 @@ KHTMLParser::KHTMLParser( KHTMLView *_parent, DocumentImpl *doc)
reset();
}
-KHTMLParser::KHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc )
+TDEHTMLParser::TDEHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc )
{
HTMLWidget = 0;
document = doc;
@@ -161,7 +161,7 @@ KHTMLParser::KHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc )
inBody = true;
}
-KHTMLParser::~KHTMLParser()
+TDEHTMLParser::~TDEHTMLParser()
{
#if SPEED_DEBUG > 0
kdDebug( ) << "TIME: parsing time was = " << qt.elapsed() << endl;
@@ -175,7 +175,7 @@ KHTMLParser::~KHTMLParser()
delete isindex;
}
-void KHTMLParser::reset()
+void TDEHTMLParser::reset()
{
setCurrent ( document );
@@ -201,7 +201,7 @@ void KHTMLParser::reset()
discard_until = 0;
}
-void KHTMLParser::parseToken(Token *t)
+void TDEHTMLParser::parseToken(Token *t)
{
if (t->tid > 2*ID_CLOSE_TAG)
{
@@ -310,7 +310,7 @@ static bool isTableRelatedTag(int id)
id == ID_TH);
}
-bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
+bool TDEHTMLParser::insertNode(NodeImpl *n, bool flat)
{
int id = n->id();
@@ -821,7 +821,7 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
}
-NodeImpl *KHTMLParser::getElement(Token* t)
+NodeImpl *TDEHTMLParser::getElement(Token* t)
{
NodeImpl *n = 0;
@@ -911,11 +911,11 @@ NodeImpl *KHTMLParser::getElement(Token* t)
break;
case ID_INPUT:
if ( t->attrs &&
- KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() &&
- KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() &&
+ TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() &&
+ TDEHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() &&
!strcasecmp( t->attrs->getValue( ATTR_TYPE ), "image" ) )
{
- if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered( doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() ) ))
+ if (TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() ) ))
return 0;
}
n = new HTMLInputElementImpl(document, form);
@@ -1038,11 +1038,11 @@ NodeImpl *KHTMLParser::getElement(Token* t)
// images
case ID_IMG:
if (t->attrs&&
- KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()&&
- KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled())
+ TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()&&
+ TDEHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled())
{
TQString url = doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() );
- if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered(url))
+ if (TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered(url))
return 0;
}
n = new HTMLImageElementImpl(document, form);
@@ -1200,7 +1200,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
return n;
}
-void KHTMLParser::processCloseTag(Token *t)
+void TDEHTMLParser::processCloseTag(Token *t)
{
// support for really broken html. Can't believe I'm supporting such crap (lars)
switch(t->tid)
@@ -1244,7 +1244,7 @@ void KHTMLParser::processCloseTag(Token *t)
#endif
}
-bool KHTMLParser::isResidualStyleTag(int _id)
+bool TDEHTMLParser::isResidualStyleTag(int _id)
{
switch (_id) {
case ID_A:
@@ -1274,7 +1274,7 @@ bool KHTMLParser::isResidualStyleTag(int _id)
}
}
-bool KHTMLParser::isAffectedByResidualStyle(int _id)
+bool TDEHTMLParser::isAffectedByResidualStyle(int _id)
{
if (isResidualStyleTag(_id))
return true;
@@ -1304,7 +1304,7 @@ bool KHTMLParser::isAffectedByResidualStyle(int _id)
}
}
-void KHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
+void TDEHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
{
// Find the element that crosses over to a higher level.
// ### For now, if there is more than one, we will only make sure we close the residual style.
@@ -1487,7 +1487,7 @@ void KHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
// if it becomes necessary to do so.
}
-void KHTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* malformedTableParent)
+void TDEHTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* malformedTableParent)
{
// Loop for each tag that needs to be reopened.
while (elem) {
@@ -1525,7 +1525,7 @@ void KHTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* ma
}
}
-void KHTMLParser::pushBlock(int _id, int _level)
+void TDEHTMLParser::pushBlock(int _id, int _level)
{
HTMLStackElem *Elem = new HTMLStackElem(_id, _level, current, m_inline, blockStack);
@@ -1533,7 +1533,7 @@ void KHTMLParser::pushBlock(int _id, int _level)
addForbidden(_id, forbiddenTag);
}
-void KHTMLParser::popBlock( int _id )
+void TDEHTMLParser::popBlock( int _id )
{
HTMLStackElem *Elem = blockStack;
int maxLevel = 0;
@@ -1619,7 +1619,7 @@ void KHTMLParser::popBlock( int _id )
reopenResidualStyleTags(residualStyleStack, malformedTableParent);
}
-void KHTMLParser::popOneBlock(bool delBlock)
+void TDEHTMLParser::popOneBlock(bool delBlock)
{
HTMLStackElem *Elem = blockStack;
@@ -1661,20 +1661,20 @@ void KHTMLParser::popOneBlock(bool delBlock)
delete Elem;
}
-void KHTMLParser::popInlineBlocks()
+void TDEHTMLParser::popInlineBlocks()
{
while(blockStack && current->isInline() && current->id() != ID_FONT)
popOneBlock();
}
-void KHTMLParser::freeBlock()
+void TDEHTMLParser::freeBlock()
{
while (blockStack)
popOneBlock();
blockStack = 0;
}
-void KHTMLParser::createHead()
+void TDEHTMLParser::createHead()
{
if(head || !doc()->firstChild())
return;
@@ -1692,7 +1692,7 @@ void KHTMLParser::createHead()
}
}
-NodeImpl *KHTMLParser::handleIsindex( Token *t )
+NodeImpl *TDEHTMLParser::handleIsindex( Token *t )
{
NodeImpl *n;
HTMLFormElementImpl *myform = form;
@@ -1718,7 +1718,7 @@ NodeImpl *KHTMLParser::handleIsindex( Token *t )
return n;
}
-void KHTMLParser::startBody()
+void TDEHTMLParser::startBody()
{
if(inBody) return;
diff --git a/tdehtml/html/htmlparser.h b/tdehtml/html/htmlparser.h
index 660ced9e9..79f2b14c7 100644
--- a/tdehtml/html/htmlparser.h
+++ b/tdehtml/html/htmlparser.h
@@ -44,7 +44,7 @@
#include "html/html_documentimpl.h"
#include "html/RefPtr.h"
-class KHTMLView;
+class TDEHTMLView;
class HTMLStackElem;
namespace DOM {
@@ -66,12 +66,12 @@ class Token;
* The parser for html. It receives a stream of tokens from the HTMLTokenizer, and
* builds up the Document structure form it.
*/
-class KHTMLParser
+class TDEHTMLParser
{
public:
- KHTMLParser( KHTMLView *w, DOM::DocumentImpl *i );
- KHTMLParser( DOM::DocumentFragmentImpl *frag, DOM::DocumentImpl *doc );
- virtual ~KHTMLParser();
+ TDEHTMLParser( TDEHTMLView *w, DOM::DocumentImpl *i );
+ TDEHTMLParser( DOM::DocumentFragmentImpl *frag, DOM::DocumentImpl *doc );
+ virtual ~TDEHTMLParser();
/**
* parses one token delivered by the tokenizer
@@ -92,7 +92,7 @@ public:
protected:
- KHTMLView *HTMLWidget;
+ TDEHTMLView *HTMLWidget;
DOM::DocumentImpl *document;
/*
diff --git a/tdehtml/html/htmltokenizer.cpp b/tdehtml/html/htmltokenizer.cpp
index 83bfd4bd5..62d3ffab6 100644
--- a/tdehtml/html/htmltokenizer.cpp
+++ b/tdehtml/html/htmltokenizer.cpp
@@ -69,9 +69,9 @@ static const char styleEnd [] = "deref(this);
if ( buffer )
- KHTML_DELETE_QCHAR_VEC(buffer);
+ TDEHTML_DELETE_QCHAR_VEC(buffer);
buffer = dest = 0;
size = 0;
if ( scriptCode )
- KHTML_DELETE_QCHAR_VEC(scriptCode);
+ TDEHTML_DELETE_QCHAR_VEC(scriptCode);
scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
@@ -186,7 +186,7 @@ void HTMLTokenizer::begin()
onHold = false;
reset();
size = 254;
- buffer = KHTML_ALLOC_QCHAR_VEC( 255 );
+ buffer = TDEHTML_ALLOC_QCHAR_VEC( 255 );
dest = buffer;
tag = NoTag;
pending = NonePending;
@@ -1578,10 +1578,10 @@ void HTMLTokenizer::end()
processToken();
if(buffer)
- KHTML_DELETE_QCHAR_VEC(buffer);
+ TDEHTML_DELETE_QCHAR_VEC(buffer);
if(scriptCode)
- KHTML_DELETE_QCHAR_VEC(scriptCode);
+ TDEHTML_DELETE_QCHAR_VEC(scriptCode);
scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
@@ -1621,7 +1621,7 @@ void HTMLTokenizer::finish()
pos = TQConstString(scriptCode, scriptCodeSize).string().find('>');
food.setUnicode(scriptCode+pos+1, scriptCodeSize-pos-1); // deep copy
}
- KHTML_DELETE_QCHAR_VEC(scriptCode);
+ TDEHTML_DELETE_QCHAR_VEC(scriptCode);
scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
if (script)
@@ -1720,7 +1720,7 @@ void HTMLTokenizer::enlargeBuffer(int len)
int newsize = kMax(size*2, size+len);
int oldoffs = (dest - buffer);
- buffer = KHTML_REALLOC_QCHAR_VEC(buffer, newsize);
+ buffer = TDEHTML_REALLOC_QCHAR_VEC(buffer, newsize);
dest = buffer + oldoffs;
size = newsize;
}
@@ -1728,7 +1728,7 @@ void HTMLTokenizer::enlargeBuffer(int len)
void HTMLTokenizer::enlargeScriptBuffer(int len)
{
int newsize = kMax(scriptCodeMaxSize*2, scriptCodeMaxSize+len);
- scriptCode = KHTML_REALLOC_QCHAR_VEC(scriptCode, newsize);
+ scriptCode = TDEHTML_REALLOC_QCHAR_VEC(scriptCode, newsize);
scriptCodeMaxSize = newsize;
}
diff --git a/tdehtml/html/htmltokenizer.h b/tdehtml/html/htmltokenizer.h
index 5222647d4..a79f65edf 100644
--- a/tdehtml/html/htmltokenizer.h
+++ b/tdehtml/html/htmltokenizer.h
@@ -41,7 +41,7 @@
#include "xml/dom_docimpl.h"
class KCharsets;
-class KHTMLView;
+class TDEHTMLView;
namespace DOM {
class DocumentImpl;
@@ -50,7 +50,7 @@ namespace DOM {
namespace tdehtml {
class CachedScript;
- class KHTMLParser;
+ class TDEHTMLParser;
/**
* @internal
@@ -120,9 +120,9 @@ namespace tdehtml {
class HTMLTokenizer : public Tokenizer, public CachedObjectClient
{
- friend class KHTMLParser;
+ friend class TDEHTMLParser;
public:
- HTMLTokenizer(DOM::DocumentImpl *, KHTMLView * = 0);
+ HTMLTokenizer(DOM::DocumentImpl *, TDEHTMLView * = 0);
HTMLTokenizer(DOM::DocumentImpl *, DOM::DocumentFragmentImpl *frag);
virtual ~HTMLTokenizer();
@@ -347,9 +347,9 @@ protected:
tdehtml::TokenizerString src;
KCharsets *charsets;
- KHTMLParser *parser;
+ TDEHTMLParser *parser;
- KHTMLView *view;
+ TDEHTMLView *view;
};
} // namespace
diff --git a/tdehtml/htmlpageinfo.ui b/tdehtml/htmlpageinfo.ui
index 5dd21cd6f..2315771ae 100644
--- a/tdehtml/htmlpageinfo.ui
+++ b/tdehtml/htmlpageinfo.ui
@@ -1,5 +1,5 @@
-KHTMLInfoDlg
+TDEHTMLInfoDlg
A dialog to display the HTTP headers for a given page.
George Staikos <staikos@kde.org>
diff --git a/tdehtml/java/kjavaappletcontext.h b/tdehtml/java/kjavaappletcontext.h
index 119699f23..8ccedfe38 100644
--- a/tdehtml/java/kjavaappletcontext.h
+++ b/tdehtml/java/kjavaappletcontext.h
@@ -30,7 +30,7 @@
* @short Provides a context for KJavaAppletWidgets
*
* Applets run in a context- (see the Java documentation for more information
- * on contexts). Currently, each document in KHTML creates one context, in
+ * on contexts). Currently, each document in TDEHTML creates one context, in
* which multiple applets can run.
*
* @author Richard J. Moore, rich@kde.org
@@ -112,12 +112,12 @@ signals:
void showStatus ( const TQString& txt );
/**
- * Signals the KHTML Part to show a url in a given target
+ * Signals the TDEHTML Part to show a url in a given target
*/
void showDocument( const TQString& url, const TQString& target );
/**
- * Signals the KHTML Part an applet is loaded
+ * Signals the TDEHTML Part an applet is loaded
**/
void appletLoaded();
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index 194a6324a..913678092 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -241,15 +241,15 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
kdDebug(6100) << "name=" << name << " value=" << value << endl;
if (!name.isEmpty()) {
const TQString name_lower = name.lower ();
- if (name == "__KHTML__PLUGINBASEURL") {
+ if (name == "__TDEHTML__PLUGINBASEURL") {
baseurl = KURL (KURL (value), TQString (".")).url ();
- } else if (name == "__KHTML__CODEBASE")
+ } else if (name == "__TDEHTML__CODEBASE")
tdehtml_codebase = value;
else if (name_lower == TQString::fromLatin1("codebase") ||
name_lower == TQString::fromLatin1("java_codebase")) {
if (!value.isEmpty ())
codebase = value;
- } else if (name == "__KHTML__CLASSID")
+ } else if (name == "__TDEHTML__CLASSID")
//else if (name.lower()==TQString::fromLatin1("classid"))
classid = value;
else if (name_lower == TQString::fromLatin1("code") ||
@@ -267,7 +267,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
width = value.toInt();
else if (name_lower == TQString::fromLatin1("height"))
height = value.toInt();
- if (!name.startsWith ("__KHTML__")) {
+ if (!name.startsWith ("__TDEHTML__")) {
applet->setParameter (name, value);
}
}
diff --git a/tdehtml/misc/decoder.h b/tdehtml/misc/decoder.h
index 2fcda7904..163e44ca7 100644
--- a/tdehtml/misc/decoder.h
+++ b/tdehtml/misc/decoder.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KHTMLDECODER_H
-#define KHTMLDECODER_H
+#ifndef TDEHTMLDECODER_H
+#define TDEHTMLDECODER_H
#include
class TQTextCodec;
diff --git a/tdehtml/misc/htmltags.h b/tdehtml/misc/htmltags.h
index a2fb0fe55..d8fbb3236 100644
--- a/tdehtml/misc/htmltags.h
+++ b/tdehtml/misc/htmltags.h
@@ -1,8 +1,8 @@
/* This file is automatically generated from htmltags.in by maketags, do not edit */
/* Copyright 1999 Lars Knoll */
-#ifndef KHTML_TAGS_H
-#define KHTML_TAGS_H
+#ifndef TDEHTML_TAGS_H
+#define TDEHTML_TAGS_H
#include "dom/dom_string.h"
#include
diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp
index 5cd18f29b..6f19d01aa 100644
--- a/tdehtml/misc/loader.cpp
+++ b/tdehtml/misc/loader.cpp
@@ -486,7 +486,7 @@ CachedImage::CachedImage(DocLoader* dl, const DOMString &url, TDEIO::CacheContro
setAccept( acceptHeader );
m_showAnimations = dl->showAnimations();
- if ( KHTMLFactory::defaultHTMLSettings()->isAdFiltered( url.string() ) ) {
+ if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( url.string() ) ) {
m_wasBlocked = true;
CachedObject::finish();
}
@@ -735,13 +735,13 @@ void CachedImage::movieStatus(int status)
}
if((status == TQMovie::EndOfMovie && (!m || m->frameNumber() <= 1)) ||
- ((status == TQMovie::EndOfLoop) && (m_showAnimations == KHTMLSettings::KAnimationLoopOnce)) ||
- ((status == TQMovie::EndOfFrame) && (m_showAnimations == KHTMLSettings::KAnimationDisabled))
+ ((status == TQMovie::EndOfLoop) && (m_showAnimations == TDEHTMLSettings::KAnimationLoopOnce)) ||
+ ((status == TQMovie::EndOfFrame) && (m_showAnimations == TDEHTMLSettings::KAnimationDisabled))
)
{
if(imgSource)
{
- setShowAnimations( KHTMLSettings::KAnimationDisabled );
+ setShowAnimations( TDEHTMLSettings::KAnimationDisabled );
// monochrome alphamasked images are usually about 10000 times
// faster to draw, so this is worth the hack
@@ -779,10 +779,10 @@ void CachedImage::movieResize(const TQSize& /*s*/)
do_notify(m->framePixmap(), TQRect());
}
-void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations )
+void CachedImage::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnimations )
{
m_showAnimations = showAnimations;
- if ( (m_showAnimations == KHTMLSettings::KAnimationDisabled) && imgSource ) {
+ if ( (m_showAnimations == TDEHTMLSettings::KAnimationDisabled) && imgSource ) {
imgSource->cleanBuffer();
delete p;
p = new TQPixmap(m->framePixmap());
@@ -941,13 +941,13 @@ Request::~Request()
// ------------------------------------------------------------------------------------------
-DocLoader::DocLoader(KHTMLPart* part, DocumentImpl* doc)
+DocLoader::DocLoader(TDEHTMLPart* part, DocumentImpl* doc)
{
m_cachePolicy = TDEIO::CC_Verify;
m_expireDate = 0;
m_creationDate = time(0);
m_bautoloadImages = true;
- m_showAnimations = KHTMLSettings::KAnimationEnabled;
+ m_showAnimations = TDEHTMLSettings::KAnimationEnabled;
m_part = part;
m_doc = doc;
@@ -1052,8 +1052,8 @@ CachedCSSStyleSheet *DocLoader::requestStyleSheet( const DOM::DOMString &url, co
CachedScript *DocLoader::requestScript( const DOM::DOMString &url, const TQString& charset)
{
DOCLOADER_SECCHECK(true);
- if ( ! KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(fullURL.host()) ||
- KHTMLFactory::defaultHTMLSettings()->isAdFiltered(fullURL.url()))
+ if ( ! TDEHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(fullURL.host()) ||
+ TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered(fullURL.url()))
return 0L;
CachedScript* s = Cache::requestObject( this, fullURL, 0 );
@@ -1086,7 +1086,7 @@ void DocLoader::setAutoloadImages( bool enable )
}
}
-void DocLoader::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations )
+void DocLoader::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnimations )
{
if ( showAnimations == m_showAnimations ) return;
m_showAnimations = showAnimations;
@@ -1162,7 +1162,7 @@ void Loader::servePendingRequests()
{
job->addMetaData( "referrer", req->m_docLoader->doc()->URL().url() );
- KHTMLPart *part = req->m_docLoader->part();
+ TDEHTMLPart *part = req->m_docLoader->part();
if (part )
{
job->addMetaData( "cross-domain", part->toplevelURL().url() );
@@ -1356,7 +1356,7 @@ void Cache::init()
nullPixmap = new TQPixmap;
if ( !brokenPixmap )
- brokenPixmap = new TQPixmap(KHTMLFactory::instance()->iconLoader()->loadIcon("file_broken", KIcon::Desktop, 16, KIcon::DisabledState));
+ brokenPixmap = new TQPixmap(TDEHTMLFactory::instance()->iconLoader()->loadIcon("file_broken", KIcon::Desktop, 16, KIcon::DisabledState));
if ( !blockedPixmap ) {
blockedPixmap = new TQPixmap();
diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h
index fa00b4ffb..f885ec33e 100644
--- a/tdehtml/misc/loader.h
+++ b/tdehtml/misc/loader.h
@@ -55,7 +55,7 @@
#include
class TQMovie;
-class KHTMLPart;
+class TDEHTMLPart;
namespace TDEIO {
class Job;
@@ -183,7 +183,7 @@ namespace tdehtml
CachedObject* m_next;
CachedObject* m_prev;
friend class Cache;
- friend class ::KHTMLPart;
+ friend class ::TDEHTMLPart;
};
@@ -286,7 +286,7 @@ namespace tdehtml
const TQString& suggestedTitle() const { return m_suggestedFilename; }
#endif
- void setShowAnimations( KHTMLSettings::KAnimationAdvice );
+ void setShowAnimations( TDEHTMLSettings::KAnimationAdvice );
void pauseAnimations();
void resumeAnimations();
@@ -331,10 +331,10 @@ namespace tdehtml
bool typeChecked : 1;
bool isFullyTransparent : 1;
bool monochrome : 1;
- KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
+ TDEHTMLSettings::KAnimationAdvice m_showAnimations : 2;
friend class Cache;
- friend class ::KHTMLPart;
+ friend class ::TDEHTMLPart;
};
/**
@@ -345,7 +345,7 @@ namespace tdehtml
class DocLoader
{
public:
- DocLoader(KHTMLPart*, DOM::DocumentImpl*);
+ DocLoader(TDEHTMLPart*, DOM::DocumentImpl*);
~DocLoader();
CachedImage *requestImage( const DOM::DOMString &url);
@@ -355,16 +355,16 @@ namespace tdehtml
bool autoloadImages() const { return m_bautoloadImages; }
TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; }
- KHTMLSettings::KAnimationAdvice showAnimations() const { return m_showAnimations; }
+ TDEHTMLSettings::KAnimationAdvice showAnimations() const { return m_showAnimations; }
time_t expireDate() const { return m_expireDate; }
- KHTMLPart* part() const { return m_part; }
+ TDEHTMLPart* part() const { return m_part; }
DOM::DocumentImpl* doc() const { return m_doc; }
void setCacheCreationDate( time_t );
void setExpireDate( time_t, bool relative );
void setAutoloadImages( bool );
void setCachePolicy( TDEIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; }
- void setShowAnimations( KHTMLSettings::KAnimationAdvice );
+ void setShowAnimations( TDEHTMLSettings::KAnimationAdvice );
void pauseAnimations();
void resumeAnimations();
void insertCachedObject( CachedObject* o ) const;
@@ -375,7 +375,7 @@ namespace tdehtml
friend class Cache;
friend class DOM::DocumentImpl;
- friend class ::KHTMLPart;
+ friend class ::TDEHTMLPart;
TQStringList m_reloadedURLs;
mutable TQPtrDict m_docObjects;
@@ -383,8 +383,8 @@ namespace tdehtml
time_t m_creationDate;
TDEIO::CacheControl m_cachePolicy;
bool m_bautoloadImages : 1;
- KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
- KHTMLPart* m_part;
+ TDEHTMLSettings::KAnimationAdvice m_showAnimations : 2;
+ TDEHTMLPart* m_part;
DOM::DocumentImpl* m_doc;
};
diff --git a/tdehtml/misc/maketags b/tdehtml/misc/maketags
index a460cf8e4..b2b472892 100644
--- a/tdehtml/misc/maketags
+++ b/tdehtml/misc/maketags
@@ -37,8 +37,8 @@ print header <
diff --git a/tdehtml/misc/stringit.h b/tdehtml/misc/stringit.h
index a93a59e4d..74cdd471e 100644
--- a/tdehtml/misc/stringit.h
+++ b/tdehtml/misc/stringit.h
@@ -23,8 +23,8 @@
//
// KDE HTML Widget -- String class
-#ifndef KHTMLSTRING_H
-#define KHTMLSTRING_H
+#ifndef TDEHTMLSTRING_H
+#define TDEHTMLSTRING_H
#include "dom/dom_string.h"
diff --git a/tdehtml/rendering/bidi.cpp b/tdehtml/rendering/bidi.cpp
index a79ac9854..7916a9c4f 100644
--- a/tdehtml/rendering/bidi.cpp
+++ b/tdehtml/rendering/bidi.cpp
@@ -618,7 +618,7 @@ InlineFlowBox* RenderBlock::createLineBoxes(RenderObject* obj)
{
// See if we have an unconstructed line box for this object that is also
// the last item on the line.
- KHTMLAssert(obj->isInlineFlow() || obj == this);
+ TDEHTMLAssert(obj->isInlineFlow() || obj == this);
RenderFlow* flow = static_cast(obj);
// Get the last box we made for this render object.
@@ -633,7 +633,7 @@ InlineFlowBox* RenderBlock::createLineBoxes(RenderObject* obj)
// We need to make a new box for this render object. Once
// made, we need to place it at the end of the current line.
InlineBox* newBox = obj->createInlineBox(false, obj == this);
- KHTMLAssert(newBox->isInlineFlowBox());
+ TDEHTMLAssert(newBox->isInlineFlowBox());
box = static_cast(newBox);
box->setFirstLineStyleBit(m_firstLine);
@@ -673,7 +673,7 @@ InlineFlowBox* RenderBlock::constructLine(const BidiIterator &/*start*/, const B
// We should have a root inline box. It should be unconstructed and
// be the last continuation of our line list.
- KHTMLAssert(lastLineBox() && !lastLineBox()->isConstructed());
+ TDEHTMLAssert(lastLineBox() && !lastLineBox()->isConstructed());
// Set bits on our inline flow boxes that indicate which sides should
// paint borders/margins/padding. This knowledge will ultimately be used when
@@ -719,7 +719,7 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi
int availableWidth = lineWidth(m_height);
switch(style()->textAlign()) {
case LEFT:
- case KHTML_LEFT:
+ case TDEHTML_LEFT:
numSpaces = 0;
break;
case JUSTIFY:
@@ -732,12 +732,12 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi
if (bidi.context->basicDir == TQChar::DirL)
break;
case RIGHT:
- case KHTML_RIGHT:
+ case TDEHTML_RIGHT:
x += availableWidth - totWidth;
numSpaces = 0;
break;
case CENTER:
- case KHTML_CENTER:
+ case TDEHTML_CENTER:
int xd = (availableWidth - totWidth)/2;
x += xd >0 ? xd : 0;
numSpaces = 0;
@@ -756,7 +756,7 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi
spaces++;
}
- KHTMLAssert(spaces <= numSpaces);
+ TDEHTMLAssert(spaces <= numSpaces);
// Only justify text with white-space: normal.
if (r->obj->style()->whiteSpace() == NORMAL) {
@@ -1986,7 +1986,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
}
}
} else
- KHTMLAssert( false );
+ TDEHTMLAssert( false );
InlineMinMaxIterator savedIt = lastIt;
lastIt = it;
diff --git a/tdehtml/rendering/font.cpp b/tdehtml/rendering/font.cpp
index 3ace5ddd1..b7632fc8d 100644
--- a/tdehtml/rendering/font.cpp
+++ b/tdehtml/rendering/font.cpp
@@ -417,7 +417,7 @@ bool Font::isFontScalable(TQFontDatabase& db, const TQFont& font)
void Font::update( TQPaintDeviceMetrics* devMetrics ) const
{
- f.setFamily( fontDef.family.isEmpty() ? KHTMLFactory::defaultHTMLSettings()->stdFontName() : fontDef.family );
+ f.setFamily( fontDef.family.isEmpty() ? TDEHTMLFactory::defaultHTMLSettings()->stdFontName() : fontDef.family );
f.setItalic( fontDef.italic );
f.setWeight( fontDef.weight );
diff --git a/tdehtml/rendering/font.h b/tdehtml/rendering/font.h
index 81110e0d0..e34f54207 100644
--- a/tdehtml/rendering/font.h
+++ b/tdehtml/rendering/font.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef KHTMLFONT_H
-#define KHTMLFONT_H
+#ifndef TDEHTMLFONT_H
+#define TDEHTMLFONT_H
#include
#include
diff --git a/tdehtml/rendering/render_applet.cpp b/tdehtml/rendering/render_applet.cpp
index 1b65ca8de..d14a93553 100644
--- a/tdehtml/rendering/render_applet.cpp
+++ b/tdehtml/rendering/render_applet.cpp
@@ -48,9 +48,9 @@ RenderApplet::RenderApplet(HTMLElementImpl *applet, const TQMapgetDocument()->view();
+ TDEHTMLView *_view = applet->getDocument()->view();
if ( _view ) {
- KHTMLPart *part = _view->part();
+ TDEHTMLPart *part = _view->part();
context = part->createJavaContext();
}
@@ -89,8 +89,8 @@ void RenderApplet::layout()
{
//kdDebug(6100) << "RenderApplet::layout" << endl;
- KHTMLAssert( needsLayout() );
- KHTMLAssert( minMaxKnown() );
+ TDEHTMLAssert( needsLayout() );
+ TDEHTMLAssert( minMaxKnown() );
calcWidth();
calcHeight();
diff --git a/tdehtml/rendering/render_applet.h b/tdehtml/rendering/render_applet.h
index 24907edaa..62d023728 100644
--- a/tdehtml/rendering/render_applet.h
+++ b/tdehtml/rendering/render_applet.h
@@ -28,7 +28,7 @@
#include
#include
-class KHTMLView;
+class TDEHTMLView;
namespace DOM {
class HTMLElementImpl;
diff --git a/tdehtml/rendering/render_arena.cpp b/tdehtml/rendering/render_arena.cpp
index 14c55ef89..d3fe1676e 100644
--- a/tdehtml/rendering/render_arena.cpp
+++ b/tdehtml/rendering/render_arena.cpp
@@ -43,7 +43,7 @@ using namespace tdehtml;
namespace tdehtml {
//#ifdef NDEBUG
-#define KHTML_USE_ARENA_ALLOCATOR
+#define TDEHTML_USE_ARENA_ALLOCATOR
//#endif
typedef struct {
@@ -78,7 +78,7 @@ RenderArena::~RenderArena()
void* RenderArena::allocate(size_t size)
{
-#ifndef KHTML_USE_ARENA_ALLOCATOR
+#ifndef TDEHTML_USE_ARENA_ALLOCATOR
// Use standard malloc so that memory debugging tools work.
void *block = ::malloc(sizeof(RenderArenaDebugHeader) + size);
RenderArenaDebugHeader *header = (RenderArenaDebugHeader *)block;
@@ -89,10 +89,10 @@ void* RenderArena::allocate(size_t size)
void* result = 0;
// Ensure we have correct alignment for pointers. Important for Tru64
- size = KHTML_ROUNDUP(size, sizeof(void*));
+ size = TDEHTML_ROUNDUP(size, sizeof(void*));
// Check recyclers first
- if (size < KHTML_MAX_RECYCLED_SIZE) {
+ if (size < TDEHTML_MAX_RECYCLED_SIZE) {
const int index = size >> 2;
result = m_recyclers[index];
@@ -117,7 +117,7 @@ void* RenderArena::allocate(size_t size)
void RenderArena::free(size_t size, void* ptr)
{
-#ifndef KHTML_USE_ARENA_ALLOCATOR
+#ifndef TDEHTML_USE_ARENA_ALLOCATOR
// Use standard free so that memory debugging tools work.
assert(this);
RenderArenaDebugHeader *header = (RenderArenaDebugHeader *)ptr - 1;
@@ -131,10 +131,10 @@ void RenderArena::free(size_t size, void* ptr)
#endif
// Ensure we have correct alignment for pointers. Important for Tru64
- size = KHTML_ROUNDUP(size, sizeof(void*));
+ size = TDEHTML_ROUNDUP(size, sizeof(void*));
// See if it's a size that we recycle
- if (size < KHTML_MAX_RECYCLED_SIZE) {
+ if (size < TDEHTML_MAX_RECYCLED_SIZE) {
const int index = size >> 2;
void* currentTop = m_recyclers[index];
m_recyclers[index] = ptr;
diff --git a/tdehtml/rendering/render_arena.h b/tdehtml/rendering/render_arena.h
index 1beab6fed..a0b00ab81 100644
--- a/tdehtml/rendering/render_arena.h
+++ b/tdehtml/rendering/render_arena.h
@@ -43,8 +43,8 @@
namespace tdehtml {
-#define KHTML_MAX_RECYCLED_SIZE 400
-#define KHTML_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y))
+#define TDEHTML_MAX_RECYCLED_SIZE 400
+#define TDEHTML_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y))
class RenderArena: public Shared {
public:
@@ -61,7 +61,7 @@ private:
// The recycler array is sparse with the indices being multiples of 4,
// i.e., 0, 4, 8, 12, 16, 20, ...
- void* m_recyclers[KHTML_MAX_RECYCLED_SIZE >> 2];
+ void* m_recyclers[TDEHTML_MAX_RECYCLED_SIZE >> 2];
};
diff --git a/tdehtml/rendering/render_block.cpp b/tdehtml/rendering/render_block.cpp
index 3c6c79543..82d99cf41 100644
--- a/tdehtml/rendering/render_block.cpp
+++ b/tdehtml/rendering/render_block.cpp
@@ -1,5 +1,5 @@
/*
- * This file is part of the render object implementation for KHTML.
+ * This file is part of the render object implementation for TDEHTML.
*
* Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
* (C) 1999-2003 Antti Koivisto (koivisto@kde.org)
@@ -279,7 +279,7 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi
// needed in cases of things like anonymous tables.
if (beforeChild && beforeChild->parent() != this) {
- KHTMLAssert(beforeChild->parent());
+ TDEHTMLAssert(beforeChild->parent());
// In the special case where we are prepending a block-level element before
// something contained inside an anonymous block, we can just prepend it before
@@ -317,8 +317,8 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi
if (beforeChild && beforeChild->parent() != this) {
beforeChild = beforeChild->parent();
- KHTMLAssert(beforeChild->isAnonymousBlock());
- KHTMLAssert(beforeChild->parent() == this);
+ TDEHTMLAssert(beforeChild->isAnonymousBlock());
+ TDEHTMLAssert(beforeChild->parent() == this);
}
}
else if (!m_childrenInline && !newChild->isFloatingOrPositioned())
@@ -421,8 +421,8 @@ void RenderBlock::makeChildrenNonInline(RenderObject *insertionPoint)
// means that we cannot coalesce inlines before |insertionPoint| with inlines following
// |insertionPoint|, because the new child is going to be inserted in between the inlines,
// splitting them.
- KHTMLAssert(isReplacedBlock() || !isInline());
- KHTMLAssert(!insertionPoint || insertionPoint->parent() == this);
+ TDEHTMLAssert(isReplacedBlock() || !isInline());
+ TDEHTMLAssert(!insertionPoint || insertionPoint->parent() == this);
m_childrenInline = false;
@@ -454,8 +454,8 @@ void RenderBlock::makeChildrenNonInline(RenderObject *insertionPoint)
void RenderBlock::makePageBreakAvoidBlocks()
{
- KHTMLAssert(!childrenInline());
- KHTMLAssert(canvas()->pagedMode());
+ TDEHTMLAssert(!childrenInline());
+ TDEHTMLAssert(canvas()->pagedMode());
RenderObject *breakAfter = firstChild();
RenderObject *breakBefore = breakAfter ? breakAfter->nextSibling() : 0;
@@ -620,8 +620,8 @@ void RenderBlock::layoutBlock(bool relayoutChildren)
// kdDebug( 6040 ) << renderName() << " " << this << "::layoutBlock() start" << endl;
// TQTime t;
// t.start();
- KHTMLAssert( needsLayout() );
- KHTMLAssert( minMaxKnown() );
+ TDEHTMLAssert( needsLayout() );
+ TDEHTMLAssert( minMaxKnown() );
if (canvas()->pagedMode()) relayoutChildren = true;
@@ -737,7 +737,7 @@ void RenderBlock::layoutBlock(bool relayoutChildren)
// Check for an overhanging float first.
// FIXME: This needs to look at the last flow, not the last child.
if (lastChild() && lastChild()->hasOverhangingFloats() && !lastChild()->hasOverflowClip()) {
- KHTMLAssert(lastChild()->isRenderBlock());
+ TDEHTMLAssert(lastChild()->isRenderBlock());
m_height = lastChild()->yPos() + static_cast(lastChild())->floatBottom();
m_height += borderBottom() + paddingBottom();
}
@@ -950,7 +950,7 @@ void RenderBlock::insertCompactIfNeeded(RenderObject* child, CompactInfo& compac
int compactYPos = child->yPos() + child->borderTop() + child->paddingTop()
- compactChild->paddingTop() - compactChild->borderTop();
int adj = 0;
- KHTMLAssert(child->isRenderBlock());
+ TDEHTMLAssert(child->isRenderBlock());
InlineRunBox *b = static_cast(child)->firstLineBox();
InlineRunBox *c = static_cast(compactChild)->firstLineBox();
if (b && c) {
@@ -1162,8 +1162,8 @@ void RenderBlock::clearFloatsIfNeeded(RenderObject* child, MarginInfo& marginInf
bool RenderBlock::canClear(RenderObject *child, PageBreakLevel level)
{
- KHTMLAssert(child->parent() && child->parent() == this);
- KHTMLAssert(canvas()->pagedMode());
+ TDEHTMLAssert(child->parent() && child->parent() == this);
+ TDEHTMLAssert(canvas()->pagedMode());
// Positioned elements cannot be moved. Only normal flow and floating.
if (child->isPositioned() || child->isRelPositioned()) return false;
@@ -1190,8 +1190,8 @@ bool RenderBlock::canClear(RenderObject *child, PageBreakLevel level)
void RenderBlock::clearPageBreak(RenderObject* child, int pageBottom)
{
- KHTMLAssert(child->parent() && child->parent() == this);
- KHTMLAssert(canvas()->pagedMode());
+ TDEHTMLAssert(child->parent() && child->parent() == this);
+ TDEHTMLAssert(canvas()->pagedMode());
if (child->yPos() >= pageBottom) return;
@@ -1257,7 +1257,7 @@ void RenderBlock::determineHorizontalPosition(RenderObject* child)
// to shift over as necessary to dodge any floats that might get in the way.
if (child->flowAroundFloats()) {
int leftOff = leftOffset(m_height);
- if (style()->textAlign() != KHTML_CENTER && !child->style()->marginLeft().isVariable()) {
+ if (style()->textAlign() != TDEHTML_CENTER && !child->style()->marginLeft().isVariable()) {
if (child->marginLeft() < 0)
leftOff += child->marginLeft();
chPos = kMax(chPos, leftOff); // Let the float sit in the child's margin if it can fit.
@@ -1281,7 +1281,7 @@ void RenderBlock::determineHorizontalPosition(RenderObject* child)
int chPos = xPos - (child->width() + child->marginRight());
if (child->flowAroundFloats()) {
int rightOff = rightOffset(m_height);
- if (style()->textAlign() != KHTML_CENTER && !child->style()->marginRight().isVariable()) {
+ if (style()->textAlign() != TDEHTML_CENTER && !child->style()->marginRight().isVariable()) {
if (child->marginRight() < 0)
rightOff -= child->marginRight();
chPos = kMin(chPos, rightOff - child->width()); // Let the float sit in the child's margin if it can fit.
@@ -1789,7 +1789,7 @@ void RenderBlock::insertFloatingObject(RenderObject *o)
else {
// We should never get here, as insertFloatingObject() should only ever be called with floating
// objects.
- KHTMLAssert(false);
+ TDEHTMLAssert(false);
newObj = 0; // keep gcc's uninitialized variable warnings happy
}
@@ -2568,7 +2568,7 @@ bool RenderBlock::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty,
void RenderBlock::calcMinMaxWidth()
{
- KHTMLAssert( !minMaxKnown() );
+ TDEHTMLAssert( !minMaxKnown() );
#ifdef DEBUG_LAYOUT
kdDebug( 6040 ) << renderName() << "(RenderBlock)::calcMinMaxWidth() this=" << this << endl;
diff --git a/tdehtml/rendering/render_block.h b/tdehtml/rendering/render_block.h
index 84fd15a0b..36d3f6cc4 100644
--- a/tdehtml/rendering/render_block.h
+++ b/tdehtml/rendering/render_block.h
@@ -1,5 +1,5 @@
/*
- * This file is part of the render object implementation for KHTML.
+ * This file is part of the render object implementation for TDEHTML.
*
* Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
* (C) 1999-2003 Antti Koivisto (koivisto@kde.org)
diff --git a/tdehtml/rendering/render_box.cpp b/tdehtml/rendering/render_box.cpp
index 4cf7080c7..d138d3ee2 100644
--- a/tdehtml/rendering/render_box.cpp
+++ b/tdehtml/rendering/render_box.cpp
@@ -119,7 +119,7 @@ static inline bool overflowAppliesTo(RenderObject* o)
// css 2.1-11.1.1
// 1) overflow only applies to non-replaced block-level elements, table cells, and inline-block elements
if (o->isRenderBlock() || o->isTableRow() || o->isTableSection())
- // 2) overflow on root applies to the viewport (cf. KHTMLView::layout)
+ // 2) overflow on root applies to the viewport (cf. TDEHTMLView::layout)
if (!o->isRoot())
// 3) overflow on body may apply to the viewport...
if (!o->isBody()
@@ -995,7 +995,7 @@ void RenderBox::calcHorizontalMargins(const Length& ml, const Length& mr, int cw
{
if ( (ml.isVariable() && mr.isVariable() && m_widthstyle()->textAlign() == KHTML_CENTER) )
+ containingBlock()->style()->textAlign() == TDEHTML_CENTER) )
{
m_marginLeft = (cw - m_width)/2;
if (m_marginLeft<0) m_marginLeft=0;
@@ -1003,14 +1003,14 @@ void RenderBox::calcHorizontalMargins(const Length& ml, const Length& mr, int cw
}
else if ( (mr.isVariable() && m_widthstyle()->direction() == RTL &&
- containingBlock()->style()->textAlign() == KHTML_LEFT))
+ containingBlock()->style()->textAlign() == TDEHTML_LEFT))
{
m_marginLeft = ml.width(cw);
m_marginRight = cw - m_width - m_marginLeft;
}
else if ( (ml.isVariable() && m_widthstyle()->direction() == LTR &&
- containingBlock()->style()->textAlign() == KHTML_RIGHT))
+ containingBlock()->style()->textAlign() == TDEHTML_RIGHT))
{
m_marginRight = mr.width(cw);
m_marginLeft = cw - m_width - m_marginRight;
@@ -2295,15 +2295,15 @@ void RenderBox::caretPos(int /*offset*/, int flags, int &_x, int &_y, int &width
// ### regard direction
switch (s->textAlign()) {
case LEFT:
- case KHTML_LEFT:
+ case TDEHTML_LEFT:
case TAAUTO: // ### find out what this does
case JUSTIFY:
break;
case CENTER:
- case KHTML_CENTER:
+ case TDEHTML_CENTER:
_x += contentWidth() / 2;
break;
- case KHTML_RIGHT:
+ case TDEHTML_RIGHT:
case RIGHT:
_x += contentWidth();
break;
diff --git a/tdehtml/rendering/render_canvas.cpp b/tdehtml/rendering/render_canvas.cpp
index 53dc32162..a3dc548b2 100644
--- a/tdehtml/rendering/render_canvas.cpp
+++ b/tdehtml/rendering/render_canvas.cpp
@@ -36,7 +36,7 @@ using namespace tdehtml;
//#define BOX_DEBUG
//#define SPEED_DEBUG
-RenderCanvas::RenderCanvas(DOM::NodeImpl* node, KHTMLView *view)
+RenderCanvas::RenderCanvas(DOM::NodeImpl* node, TDEHTMLView *view)
: RenderBlock(node)
{
// init RenderObject attributes
@@ -103,7 +103,7 @@ void RenderCanvas::calcHeight()
void RenderCanvas::calcWidth()
{
- // the width gets set by KHTMLView::print when printing to a printer.
+ // the width gets set by TDEHTMLView::print when printing to a printer.
if(m_pagedMode || !m_view)
{
m_width = m_rootWidth;
@@ -125,7 +125,7 @@ void RenderCanvas::calcWidth()
void RenderCanvas::calcMinMaxWidth()
{
- KHTMLAssert( !minMaxKnown() );
+ TDEHTMLAssert( !minMaxKnown() );
RenderBlock::calcMinMaxWidth();
@@ -271,7 +271,7 @@ bool RenderCanvas::needsFullRepaint() const
void RenderCanvas::repaintViewRectangle(int x, int y, int w, int h, bool asap)
{
- KHTMLAssert( view() );
+ TDEHTMLAssert( view() );
view()->scheduleRepaint( x, y, w, h, asap );
}
diff --git a/tdehtml/rendering/render_canvas.h b/tdehtml/rendering/render_canvas.h
index 8495b87bc..6c05a4945 100644
--- a/tdehtml/rendering/render_canvas.h
+++ b/tdehtml/rendering/render_canvas.h
@@ -25,7 +25,7 @@
#include "render_block.h"
-class KHTMLView;
+class TDEHTMLView;
class TQScrollView;
namespace tdehtml {
@@ -42,7 +42,7 @@ enum CanvasMode {
class RenderCanvas : public RenderBlock
{
public:
- RenderCanvas(DOM::NodeImpl* node, KHTMLView *view);
+ RenderCanvas(DOM::NodeImpl* node, TDEHTMLView *view);
~RenderCanvas();
virtual const char *renderName() const { return "RenderCanvas"; }
@@ -59,7 +59,7 @@ public:
int docHeight() const;
int docWidth() const;
- KHTMLView *view() const { return m_view; }
+ TDEHTMLView *view() const { return m_view; }
virtual void repaint(Priority p=NormalPriority);
virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
@@ -145,7 +145,7 @@ protected:
virtual TQRect viewRect() const;
- KHTMLView *m_view;
+ TDEHTMLView *m_view;
RenderObject* m_selectionStart;
RenderObject* m_selectionEnd;
diff --git a/tdehtml/rendering/render_container.cpp b/tdehtml/rendering/render_container.cpp
index b91bc91df..bf0cd37ec 100644
--- a/tdehtml/rendering/render_container.cpp
+++ b/tdehtml/rendering/render_container.cpp
@@ -127,7 +127,7 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild
break;
case NONE:
// RenderHtml and some others can have display:none
- // KHTMLAssert(false);
+ // TDEHTMLAssert(false);
break;
}
}
@@ -167,7 +167,7 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild
RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild)
{
- KHTMLAssert(oldChild->parent() == this);
+ TDEHTMLAssert(oldChild->parent() == this);
// So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or
// that a positioned child got yanked). We also repaint, so that the area exposed when the child
@@ -465,7 +465,7 @@ void RenderContainer::updateReplacedContent()
void RenderContainer::appendChildNode(RenderObject* newChild)
{
- KHTMLAssert(newChild->parent() == 0);
+ TDEHTMLAssert(newChild->parent() == 0);
newChild->setParent(this);
RenderObject* lChild = lastChild();
@@ -499,10 +499,10 @@ void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeC
return;
}
- KHTMLAssert(!child->parent());
+ TDEHTMLAssert(!child->parent());
while ( beforeChild->parent() != this && beforeChild->parent()->isAnonymousBlock() )
beforeChild = beforeChild->parent();
- KHTMLAssert(beforeChild->parent() == this);
+ TDEHTMLAssert(beforeChild->parent() == this);
if(beforeChild == firstChild())
setFirstChild(child);
@@ -526,8 +526,8 @@ void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeC
void RenderContainer::layout()
{
- KHTMLAssert( needsLayout() );
- KHTMLAssert( minMaxKnown() );
+ TDEHTMLAssert( needsLayout() );
+ TDEHTMLAssert( minMaxKnown() );
const bool pagedMode = canvas()->pagedMode();
RenderObject *child = firstChild();
while( child ) {
diff --git a/tdehtml/rendering/render_flow.cpp b/tdehtml/rendering/render_flow.cpp
index 71456d0a8..272ceb2db 100644
--- a/tdehtml/rendering/render_flow.cpp
+++ b/tdehtml/rendering/render_flow.cpp
@@ -289,7 +289,7 @@ void RenderFlow::repaint(Priority prior)
for (RenderObject* inlineFlow = this; inlineFlow && inlineFlow->isInlineFlow() && inlineFlow != cb;
inlineFlow = inlineFlow->parent()) {
if (inlineFlow->style() && inlineFlow->style()->position() == RELATIVE && inlineFlow->layer()) {
- KHTMLAssert(inlineFlow->isBox());
+ TDEHTMLAssert(inlineFlow->isBox());
static_cast(inlineFlow)->relativePositionOffset(left, top);
}
}
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 2872a0e6c..5c8249b6b 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -83,8 +83,8 @@ void RenderFormElement::updateFromElement()
void RenderFormElement::layout()
{
- KHTMLAssert( needsLayout() );
- KHTMLAssert( minMaxKnown() );
+ TDEHTMLAssert( needsLayout() );
+ TDEHTMLAssert( minMaxKnown() );
// minimum height
m_height = 0;
@@ -103,13 +103,13 @@ TQ_Alignment RenderFormElement::textAlignment() const
{
switch (style()->textAlign()) {
case LEFT:
- case KHTML_LEFT:
+ case TDEHTML_LEFT:
return Qt::AlignLeft;
case RIGHT:
- case KHTML_RIGHT:
+ case TDEHTML_RIGHT:
return Qt::AlignRight;
case CENTER:
- case KHTML_CENTER:
+ case TDEHTML_CENTER:
return Qt::AlignHCenter;
case JUSTIFY:
// Just fall into the auto code for justify.
@@ -152,7 +152,7 @@ RenderCheckBox::RenderCheckBox(HTMLInputElementImpl *element)
void RenderCheckBox::calcMinMaxWidth()
{
- KHTMLAssert( !minMaxKnown() );
+ TDEHTMLAssert( !minMaxKnown() );
TQCheckBox *cb = static_cast( m_widget );
TQSize s( cb->style().pixelMetric( TQStyle::PM_IndicatorWidth ),
@@ -204,7 +204,7 @@ void RenderRadioButton::updateFromElement()
void RenderRadioButton::calcMinMaxWidth()
{
- KHTMLAssert( !minMaxKnown() );
+ TDEHTMLAssert( !minMaxKnown() );
TQRadioButton *rb = static_cast( m_widget );
TQSize s( rb->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ),
@@ -251,7 +251,7 @@ TQString RenderSubmitButton::rawText()
void RenderSubmitButton::calcMinMaxWidth()
{
- KHTMLAssert( !minMaxKnown() );
+ TDEHTMLAssert( !minMaxKnown() );
TQString raw = rawText();
TQPushButton* pb = static_cast(m_widget);
@@ -307,7 +307,7 @@ RenderResetButton::RenderResetButton(HTMLInputElementImpl *element)
// -------------------------------------------------------------------------------
-LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, KHTMLView* view, TQWidget* parent)
+LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* view, TQWidget* parent)
: KLineEdit(parent, "__tdehtml"), m_input(input), m_view(view), m_spell(0)
{
setMouseTracking(true);
@@ -532,7 +532,7 @@ void RenderLineEdit::handleFocusOut()
void RenderLineEdit::calcMinMaxWidth()
{
- KHTMLAssert( !minMaxKnown() );
+ TDEHTMLAssert( !minMaxKnown() );
const TQFontMetrics &fm = style()->fontMetrics();
TQSize s;
@@ -797,7 +797,7 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element)
void RenderFileButton::calcMinMaxWidth()
{
- KHTMLAssert( !minMaxKnown() );
+ TDEHTMLAssert( !minMaxKnown() );
const TQFontMetrics &fm = style()->fontMetrics();
int size = element()->size();
@@ -1032,7 +1032,7 @@ void RenderSelect::updateFromElement()
static_cast(m_widget)->insertItem(text, listIndex);
}
else
- KHTMLAssert(false);
+ TDEHTMLAssert(false);
m_selectionChanged = true;
}
@@ -1058,7 +1058,7 @@ void RenderSelect::updateFromElement()
void RenderSelect::calcMinMaxWidth()
{
- KHTMLAssert( !minMaxKnown() );
+ TDEHTMLAssert( !minMaxKnown() );
if (m_optionsChanged)
updateFromElement();
@@ -1074,8 +1074,8 @@ void RenderSelect::calcMinMaxWidth()
void RenderSelect::layout( )
{
- KHTMLAssert(needsLayout());
- KHTMLAssert(minMaxKnown());
+ TDEHTMLAssert(needsLayout());
+ TDEHTMLAssert(minMaxKnown());
// ### maintain selection properly between type/size changes, and work
// out how to handle multiselect->singleselect (probably just select
@@ -1137,7 +1137,7 @@ void RenderSelect::slotSelected(int index) // emitted by the combobox only
{
if ( m_ignoreSelectEvents ) return;
- KHTMLAssert( !m_useListBox );
+ TDEHTMLAssert( !m_useListBox );
TQMemArray listItems = element()->listItems();
if(index >= 0 && index < int(listItems.size()))
@@ -1561,7 +1561,7 @@ void TextAreaWidget::slotFind()
if ( m_findDlg ) {
KWin::activateWindow( m_findDlg->winId() );
} else {
- m_findDlg = new KFindDialog(false, this, "KHTML Text Area Find Dialog");
+ m_findDlg = new KFindDialog(false, this, "TDEHTML Text Area Find Dialog");
connect( m_findDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoFind()) );
}
m_findDlg->show();
@@ -1576,7 +1576,7 @@ void TextAreaWidget::slotReplace()
if ( m_repDlg ) {
KWin::activateWindow( m_repDlg->winId() );
} else {
- m_repDlg = new KReplaceDialog(this, "KHTMLText Area Replace Dialog", 0,
+ m_repDlg = new KReplaceDialog(this, "TDEHTMLText Area Replace Dialog", 0,
TQStringList(), TQStringList(), false);
connect( m_repDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoReplace()) );
}
@@ -1614,7 +1614,7 @@ RenderTextArea::RenderTextArea(HTMLTextAreaElementImpl *element)
TextAreaWidget *edit = new TextAreaWidget(element->wrap(), view());
setQWidget(edit);
- const KHTMLSettings *settings = view()->part()->settings();
+ const TDEHTMLSettings *settings = view()->part()->settings();
edit->setCheckSpellingEnabled( settings->autoSpellCheck() );
edit->setTabChangesFocus( ! settings->allowTabulation() );
@@ -1645,7 +1645,7 @@ void RenderTextArea::handleFocusOut()
void RenderTextArea::calcMinMaxWidth()
{
- KHTMLAssert( !minMaxKnown() );
+ TDEHTMLAssert( !minMaxKnown() );
TextAreaWidget* w = static_cast(m_widget);
const TQFontMetrics &m = style()->fontMetrics();
@@ -1680,7 +1680,7 @@ void RenderTextArea::setStyle(RenderStyle* _style)
void RenderTextArea::layout()
{
- KHTMLAssert( needsLayout() );
+ TDEHTMLAssert( needsLayout() );
RenderFormElement::layout();
diff --git a/tdehtml/rendering/render_form.h b/tdehtml/rendering/render_form.h
index d1611c1e0..d4508e6bc 100644
--- a/tdehtml/rendering/render_form.h
+++ b/tdehtml/rendering/render_form.h
@@ -45,7 +45,7 @@ class QListboxItem;
#include
#include "dom/dom_misc.h"
-class KHTMLPartBrowserExtension;
+class TDEHTMLPartBrowserExtension;
class KSpell;
class KFindDialog;
class KReplaceDialog;
@@ -256,7 +256,7 @@ class LineEditWidget : public KLineEdit
Q_OBJECT
public:
LineEditWidget(DOM::HTMLInputElementImpl* input,
- KHTMLView* view, TQWidget* parent);
+ TDEHTMLView* view, TQWidget* parent);
~LineEditWidget();
void highLightWord( unsigned int length, unsigned int pos );
@@ -280,7 +280,7 @@ private:
EditHistory
};
DOM::HTMLInputElementImpl* m_input;
- KHTMLView* m_view;
+ TDEHTMLView* m_view;
KSpell *m_spell;
KAction *m_spellAction;
};
diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp
index 03d55fbfd..66e2fda75 100644
--- a/tdehtml/rendering/render_frames.cpp
+++ b/tdehtml/rendering/render_frames.cpp
@@ -101,11 +101,11 @@ bool RenderFrameSet::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _t
void RenderFrameSet::layout( )
{
- KHTMLAssert( needsLayout() );
- KHTMLAssert( minMaxKnown() );
+ TDEHTMLAssert( needsLayout() );
+ TDEHTMLAssert( minMaxKnown() );
if ( !parent()->isFrameSet() ) {
- KHTMLView* view = canvas()->view();
+ TDEHTMLView* view = canvas()->view();
m_width = view ? view->visibleWidth() : 0;
m_height = view ? view->visibleHeight() : 0;
}
@@ -545,7 +545,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
setNeedsLayout(true);
}
- KHTMLView *view = canvas()->view();
+ TDEHTMLView *view = canvas()->view();
if ((m_resizing || evt->id() == EventImpl::MOUSEUP_EVENT) && view) {
TQPainter paint( view );
paint.setPen( Qt::gray );
@@ -635,7 +635,7 @@ void RenderPart::setWidget( TQWidget *widget )
setQWidget( widget );
widget->setFocusPolicy(TQ_WheelFocus);
- if(widget->inherits("KHTMLView"))
+ if(widget->inherits("TDEHTMLView"))
connect( widget, TQT_SIGNAL( cleared() ), this, TQT_SLOT( slotViewCleared() ) );
setNeedsLayoutAndMinMaxRecalc();
@@ -683,11 +683,11 @@ void RenderFrame::slotViewCleared()
view->setFrameStyle(TQFrame::NoFrame);
view->setVScrollBarMode(element()->scrolling );
view->setHScrollBarMode(element()->scrolling );
- if(view->inherits("KHTMLView")) {
+ if(view->inherits("TDEHTMLView")) {
#ifdef DEBUG_LAYOUT
- kdDebug(6031) << "frame is a KHTMLview!" << endl;
+ kdDebug(6031) << "frame is a TDEHTMLview!" << endl;
#endif
- KHTMLView *htmlView = static_cast(view);
+ TDEHTMLView *htmlView = static_cast(view);
if(element()->marginWidth != -1) htmlView->setMarginWidth(element()->marginWidth);
if(element()->marginHeight != -1) htmlView->setMarginHeight(element()->marginHeight);
}
@@ -706,7 +706,7 @@ RenderPartObject::RenderPartObject( DOM::HTMLElementImpl* element )
void RenderPartObject::updateWidget()
{
TQString url;
- KHTMLPart *part = m_view->part();
+ TDEHTMLPart *part = m_view->part();
setNeedsLayoutAndMinMaxRecalc();
@@ -754,8 +754,8 @@ void RenderPartObject::updateWidget()
}
}
}
- params.append( TQString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") );
- params.append( TQString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url()));
+ params.append( TQString::fromLatin1("__TDEHTML__PLUGINEMBED=\"YES\"") );
+ params.append( TQString::fromLatin1("__TDEHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url()));
HTMLEmbedElementImpl *embed = 0;
TQString classId;
@@ -775,8 +775,8 @@ void RenderPartObject::updateWidget()
}
classId = objbase->classId;
- params.append( TQString::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) );
- params.append( TQString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) );
+ params.append( TQString::fromLatin1("__TDEHTML__CLASSID=\"%1\"").arg( classId ) );
+ params.append( TQString::fromLatin1("__TDEHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) );
if (!objbase->getAttribute(ATTR_WIDTH).isEmpty())
params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) );
else if (embed && !embed->getAttribute(ATTR_WIDTH).isEmpty()) {
@@ -857,7 +857,7 @@ void RenderPartObject::close()
bool RenderPartObject::partLoadingErrorNotify( tdehtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType )
{
- KHTMLPart *part = static_cast(m_view)->part();
+ TDEHTMLPart *part = static_cast(m_view)->part();
kdDebug(6031) << "RenderPartObject::partLoadingErrorNotify serviceType=" << serviceType << endl;
// Check if we just tried with e.g. nsplugin
// and fallback to the activexhandler if there is a classid
@@ -925,7 +925,7 @@ void RenderPartObject::slotPartLoadingErrorNotify()
// prepare for the local eventloop in KMessageBox
ref();
- KHTMLPart *part = static_cast(m_view)->part();
+ TDEHTMLPart *part = static_cast(m_view)->part();
KParts::BrowserExtension *ext = part->browserExtension();
if( embed && !embed->pluginPage.isEmpty() && ext ) {
// Prepare the mimetype to show in the question (comment if available, name as fallback)
@@ -976,8 +976,8 @@ void RenderPartObject::slotPartLoadingErrorNotify()
void RenderPartObject::layout( )
{
- KHTMLAssert( needsLayout() );
- KHTMLAssert( minMaxKnown() );
+ TDEHTMLAssert( needsLayout() );
+ TDEHTMLAssert( minMaxKnown() );
calcWidth();
calcHeight();
@@ -1009,11 +1009,11 @@ void RenderPartObject::slotViewCleared()
view->setFrameStyle(frameStyle);
view->setVScrollBarMode(scroll );
view->setHScrollBarMode(scroll );
- if(view->inherits("KHTMLView")) {
+ if(view->inherits("TDEHTMLView")) {
#ifdef DEBUG_LAYOUT
- kdDebug(6031) << "frame is a KHTMLview!" << endl;
+ kdDebug(6031) << "frame is a TDEHTMLview!" << endl;
#endif
- KHTMLView *htmlView = static_cast(view);
+ TDEHTMLView *htmlView = static_cast(view);
htmlView->setIgnoreWheelEvents( element()->id() == ID_IFRAME );
if(marginw != -1) htmlView->setMarginWidth(marginw);
if(marginh != -1) htmlView->setMarginHeight(marginh);
diff --git a/tdehtml/rendering/render_frames.h b/tdehtml/rendering/render_frames.h
index 79171c747..49d1e8dc1 100644
--- a/tdehtml/rendering/render_frames.h
+++ b/tdehtml/rendering/render_frames.h
@@ -26,7 +26,7 @@
#include "rendering/render_replaced.h"
#include "xml/dom_nodeimpl.h"
#include "html/html_baseimpl.h"
-class KHTMLView;
+class TDEHTMLView;
namespace DOM
{
@@ -102,7 +102,7 @@ public:
virtual void setWidget( TQWidget *widget );
/**
- * Called by KHTMLPart to notify the frame object that loading the
+ * Called by TDEHTMLPart to notify the frame object that loading the
* part was not successfuly. (called either asyncroniously after a
* after the servicetype of the given url (the one passed with requestObject)
* has been determined or syncroniously from within requestObject)
diff --git a/tdehtml/rendering/render_generated.cpp b/tdehtml/rendering/render_generated.cpp
index 2b793e504..d8e7a1be1 100644
--- a/tdehtml/rendering/render_generated.cpp
+++ b/tdehtml/rendering/render_generated.cpp
@@ -38,7 +38,7 @@ RenderCounterBase::RenderCounterBase(DOM::NodeImpl* node)
void RenderCounterBase::layout()
{
- KHTMLAssert( needsLayout() );
+ TDEHTMLAssert( needsLayout() );
if ( !minMaxKnown() )
calcMinMaxWidth();
@@ -48,7 +48,7 @@ void RenderCounterBase::layout()
void RenderCounterBase::calcMinMaxWidth()
{
- KHTMLAssert( !minMaxKnown() );
+ TDEHTMLAssert( !minMaxKnown() );
generateContent();
diff --git a/tdehtml/rendering/render_image.cpp b/tdehtml/rendering/render_image.cpp
index d382c9bd1..97c2641ba 100644
--- a/tdehtml/rendering/render_image.cpp
+++ b/tdehtml/rendering/render_image.cpp
@@ -64,7 +64,7 @@ RenderImage::RenderImage(NodeImpl *_element)
m_selectionState = SelectionNone;
berrorPic = false;
- const KHTMLSettings *settings = _element->getDocument()->view()->part()->settings();
+ const TDEHTMLSettings *settings = _element->getDocument()->view()->part()->settings();
bUnfinishedImageFrame = settings->unfinishedImageFrame();
setIntrinsicWidth( 0 );
@@ -378,8 +378,8 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
void RenderImage::layout()
{
- KHTMLAssert( needsLayout());
- KHTMLAssert( minMaxKnown() );
+ TDEHTMLAssert( needsLayout());
+ TDEHTMLAssert( minMaxKnown() );
short oldwidth = m_width;
int oldheight = m_height;
diff --git a/tdehtml/rendering/render_inline.cpp b/tdehtml/rendering/render_inline.cpp
index 96841eb43..aee43a817 100644
--- a/tdehtml/rendering/render_inline.cpp
+++ b/tdehtml/rendering/render_inline.cpp
@@ -1,5 +1,5 @@
/*
- * This file is part of the render object implementation for KHTML.
+ * This file is part of the render object implementation for TDEHTML.
*
* Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
* (C) 1999-2003 Antti Koivisto (koivisto@kde.org)
@@ -760,7 +760,7 @@ void RenderInline::paintOutlinePath(TQPainter *p, int tx, int ty, const TQPoint
void RenderInline::calcMinMaxWidth()
{
- KHTMLAssert( !minMaxKnown() );
+ TDEHTMLAssert( !minMaxKnown() );
#ifdef DEBUG_LAYOUT
kdDebug( 6040 ) << renderName() << "(RenderInline)::calcMinMaxWidth() this=" << this << endl;
diff --git a/tdehtml/rendering/render_inline.h b/tdehtml/rendering/render_inline.h
index 97392999e..ab854543d 100644
--- a/tdehtml/rendering/render_inline.h
+++ b/tdehtml/rendering/render_inline.h
@@ -1,5 +1,5 @@
/*
- * This file is part of the render object implementation for KHTML.
+ * This file is part of the render object implementation for TDEHTML.
*
* Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
* (C) 1999-2003 Antti Koivisto (koivisto@kde.org)
diff --git a/tdehtml/rendering/render_list.cpp b/tdehtml/rendering/render_list.cpp
index 08ee1a88b..5af983a72 100644
--- a/tdehtml/rendering/render_list.cpp
+++ b/tdehtml/rendering/render_list.cpp
@@ -180,8 +180,8 @@ short RenderListItem::marginRight() const
void RenderListItem::layout( )
{
- KHTMLAssert( needsLayout() );
- KHTMLAssert( minMaxKnown() );
+ TDEHTMLAssert( needsLayout() );
+ TDEHTMLAssert( minMaxKnown() );
updateMarkerLocation();
RenderBlock::layout();
@@ -369,7 +369,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
void RenderListMarker::layout()
{
- KHTMLAssert( needsLayout() );
+ TDEHTMLAssert( needsLayout() );
if ( !minMaxKnown() )
calcMinMaxWidth();
@@ -392,7 +392,7 @@ void RenderListMarker::setPixmap( const TQPixmap &p, const TQRect& r, CachedImag
void RenderListMarker::calcMinMaxWidth()
{
- KHTMLAssert( !minMaxKnown() );
+ TDEHTMLAssert( !minMaxKnown() );
m_markerWidth = m_width = 0;
@@ -541,7 +541,7 @@ void RenderListMarker::calcMinMaxWidth()
case LNONE:
break;
default:
- KHTMLAssert(false);
+ TDEHTMLAssert(false);
}
m_markerWidth = fm.width(m_item) + fm.width(TQString::fromLatin1(". "));
}
diff --git a/tdehtml/rendering/render_object.cpp b/tdehtml/rendering/render_object.cpp
index a3eb1565e..1d16057a2 100644
--- a/tdehtml/rendering/render_object.cpp
+++ b/tdehtml/rendering/render_object.cpp
@@ -256,12 +256,12 @@ bool RenderObject::isHTMLMarquee() const
void RenderObject::addChild(RenderObject* , RenderObject *)
{
- KHTMLAssert(0);
+ TDEHTMLAssert(0);
}
RenderObject* RenderObject::removeChildNode(RenderObject* )
{
- KHTMLAssert(0);
+ TDEHTMLAssert(0);
return 0;
}
@@ -273,12 +273,12 @@ void RenderObject::removeChild(RenderObject *o )
void RenderObject::appendChildNode(RenderObject*)
{
- KHTMLAssert(0);
+ TDEHTMLAssert(0);
}
void RenderObject::insertChildNode(RenderObject*, RenderObject*)
{
- KHTMLAssert(0);
+ TDEHTMLAssert(0);
}
RenderObject *RenderObject::nextRenderer() const
@@ -1369,7 +1369,7 @@ bool RenderObject::attemptDirectLayerTranslation()
// When the difference between two successive styles is only 'Position'
// we may attempt to save a layout by directly updating the object position.
- KHTMLAssert( m_style->position() != STATIC );
+ TDEHTMLAssert( m_style->position() != STATIC );
if (!layer())
return false;
setInline(m_style->isDisplayInlineType());
@@ -1444,7 +1444,7 @@ void RenderObject::setOverhangingContents(bool p)
if (p)
{
m_overhangingContents = true;
- KHTMLAssert( cb != this || isCanvas());
+ TDEHTMLAssert( cb != this || isCanvas());
if (cb && cb != this)
cb->setOverhangingContents();
}
@@ -1464,7 +1464,7 @@ void RenderObject::setOverhangingContents(bool p)
else
{
m_overhangingContents = false;
- KHTMLAssert( cb != this );
+ TDEHTMLAssert( cb != this );
if (cb && cb != this)
cb->setOverhangingContents(false);
}
@@ -1935,7 +1935,7 @@ void RenderObject::invalidateVerticalPositions()
void RenderObject::recalcMinMaxWidths()
{
- KHTMLAssert( m_recalcMinMax );
+ TDEHTMLAssert( m_recalcMinMax );
#ifdef DEBUG_LAYOUT
kdDebug( 6040 ) << renderName() << " recalcMinMaxWidths() this=" << this <(this)->view();
+ TDEHTMLView *view = static_cast(this)->view();
if ( view )
view->scheduleRelayout(clippedObj);
}
@@ -1986,7 +1986,7 @@ void RenderObject::removeLeftoverAnonymousBoxes()
InlineBox* RenderObject::createInlineBox(bool /*makePlaceHolderBox*/, bool /*isRootLineBox*/)
{
- KHTMLAssert(false);
+ TDEHTMLAssert(false);
return 0;
}
diff --git a/tdehtml/rendering/render_object.h b/tdehtml/rendering/render_object.h
index 9dd064932..8d066201c 100644
--- a/tdehtml/rendering/render_object.h
+++ b/tdehtml/rendering/render_object.h
@@ -43,17 +43,17 @@
class TQPainter;
class TQTextStream;
class CSSStyle;
-class KHTMLView;
+class TDEHTMLView;
#ifndef NDEBUG
-#define KHTMLAssert( x ) if( !(x) ) { \
+#define TDEHTMLAssert( x ) if( !(x) ) { \
const RenderObject *o = this; while( o->parent() ) o = o->parent(); \
o->printTree(); \
tqDebug(" this object = %p, %s", (void*) this, kdBacktrace().latin1() ); \
assert( x ); \
}
#else
-#define KHTMLAssert( x )
+#define TDEHTMLAssert( x )
#endif
/*
diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp
index 42fce027e..5a96d06f0 100644
--- a/tdehtml/rendering/render_replaced.cpp
+++ b/tdehtml/rendering/render_replaced.cpp
@@ -64,7 +64,7 @@ RenderReplaced::RenderReplaced(DOM::NodeImpl* node)
void RenderReplaced::calcMinMaxWidth()
{
- KHTMLAssert( !minMaxKnown());
+ TDEHTMLAssert( !minMaxKnown());
#ifdef DEBUG_LAYOUT
kdDebug( 6040 ) << "RenderReplaced::calcMinMaxWidth() known=" << minMaxKnown() << endl;
@@ -102,7 +102,7 @@ RenderWidget::RenderWidget(DOM::NodeImpl* node)
m_arena.reset(renderArena());
m_resizePending = false;
m_discardResizes = false;
- m_isKHTMLWidget = false;
+ m_isTDEHTMLWidget = false;
m_needsMask = false;
// this is no real reference counting, its just there
@@ -131,7 +131,7 @@ void RenderWidget::detach()
RenderWidget::~RenderWidget()
{
- KHTMLAssert( refCount() <= 0 );
+ TDEHTMLAssert( refCount() <= 0 );
if(m_widget) {
m_widget->hide();
@@ -157,7 +157,7 @@ void RenderWidget::resizeWidget( int w, int h )
w = kMin( w, 2000 );
if (m_widget->width() != w || m_widget->height() != h) {
- m_resizePending = isKHTMLWidget();
+ m_resizePending = isTDEHTMLWidget();
ref();
element()->ref();
TQApplication::postEvent( this, new TQWidgetResizeEvent( w, h ) );
@@ -185,8 +185,8 @@ bool RenderWidget::event( TQEvent *e )
m_widget->resize( re->w, re->h );
repaint();
}
- // eat all events - except if this is a frame (in which case KHTMLView handles it all)
- if ( ::tqqt_cast( m_widget ) )
+ // eat all events - except if this is a frame (in which case TDEHTMLView handles it all)
+ if ( ::tqqt_cast( m_widget ) )
return TQObject::event( e );
return true;
}
@@ -212,7 +212,7 @@ void RenderWidget::setQWidget(TQWidget *widget)
connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed()));
m_widget->installEventFilter(this);
- if ( (m_isKHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqqt_cast(m_widget))
+ if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqqt_cast(m_widget))
m_widget->setBackgroundMode( TQWidget::NoBackground );
if (m_widget->focusPolicy() > TQ_StrongFocus)
@@ -236,12 +236,12 @@ void RenderWidget::setQWidget(TQWidget *widget)
void RenderWidget::layout( )
{
- KHTMLAssert( needsLayout() );
- KHTMLAssert( minMaxKnown() );
+ TDEHTMLAssert( needsLayout() );
+ TDEHTMLAssert( minMaxKnown() );
if ( m_widget ) {
resizeWidget( m_width-borderLeft()-borderRight()-paddingLeft()-paddingRight(),
m_height-borderTop()-borderBottom()-paddingTop()-paddingBottom() );
- if (!isKHTMLWidget() && !isFrame() && !m_needsMask) {
+ if (!isTDEHTMLWidget() && !isFrame() && !m_needsMask) {
m_needsMask = true;
RenderLayer* rl = enclosingStackingContext();
RenderLayer* el = enclosingLayer();
@@ -277,7 +277,7 @@ void RenderWidget::updateFromElement()
int lowlightVal = 100 + (2*contrast_+4)*10;
if (backgroundColor.isValid()) {
- if (!isKHTMLWidget())
+ if (!isTDEHTMLWidget())
widget()->setEraseColor(backgroundColor );
for ( int i = 0; i < TQPalette::NColorGroups; ++i ) {
pal.setColor( (TQPalette::ColorGroup)i, TQColorGroup::Background, backgroundColor );
@@ -398,11 +398,11 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty)
int xPos = _tx+borderLeft()+paddingLeft();
int yPos = _ty+borderTop()+paddingTop();
- bool tdehtmlw = isKHTMLWidget();
+ bool tdehtmlw = isTDEHTMLWidget();
int childw = m_widget->width();
int childh = m_widget->height();
- if ( (childw == 2000 || childh == 3072) && m_widget->inherits( "KHTMLView" ) ) {
- KHTMLView *vw = static_cast(m_widget);
+ if ( (childw == 2000 || childh == 3072) && m_widget->inherits( "TDEHTMLView" ) ) {
+ TDEHTMLView *vw = static_cast(m_widget);
int cy = m_view->contentsY();
int ch = m_view->visibleHeight();
@@ -612,8 +612,8 @@ void RenderWidget::paintWidget(PaintInfo& pI, TQWidget *widget, int tx, int ty)
bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
{
- // no special event processing if this is a frame (in which case KHTMLView handles it all)
- if ( ::tqqt_cast( m_widget ) )
+ // no special event processing if this is a frame (in which case TDEHTMLView handles it all)
+ if ( ::tqqt_cast( m_widget ) )
return false;
if ( !element() ) return true;
@@ -655,14 +655,14 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
//kdDebug(6000) << "RenderWidget::eventFilter captures FocusIn" << endl;
element()->getDocument()->setFocusNode(element());
// if ( isEditable() ) {
-// KHTMLPartBrowserExtension *ext = static_cast( element()->view->part()->browserExtension() );
+// TDEHTMLPartBrowserExtension *ext = static_cast( element()->view->part()->browserExtension() );
// if ( ext ) ext->editableWidgetFocused( m_widget );
// }
break;
case TQEvent::KeyPress:
case TQEvent::KeyRelease:
// TODO this seems wrong - Qt events are not correctly translated to DOM ones,
- // like in KHTMLView::dispatchKeyEvent()
+ // like in TDEHTMLView::dispatchKeyEvent()
if (element()->dispatchKeyEvent(TQT_TQKEYEVENT(e),false))
filtered = true;
break;
@@ -837,13 +837,13 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
const KeyEventBaseImpl& domKeyEv = static_cast