summaryrefslogtreecommitdiffstats
path: root/tdehtml/css
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml/css')
-rw-r--r--tdehtml/css/css_renderstyledeclarationimpl.cpp56
-rw-r--r--tdehtml/css/css_valueimpl.cpp2
-rw-r--r--tdehtml/css/csshelper.h2
-rw-r--r--tdehtml/css/cssparser.cpp82
-rw-r--r--tdehtml/css/cssproperties.c30
-rw-r--r--tdehtml/css/cssproperties.h30
-rw-r--r--tdehtml/css/cssstyleselector.cpp72
-rw-r--r--tdehtml/css/cssstyleselector.h18
-rw-r--r--tdehtml/css/cssvalues.c54
-rw-r--r--tdehtml/css/cssvalues.h54
-rw-r--r--tdehtml/css/cssvalues.in6
-rw-r--r--tdehtml/css/parser.cpp14
-rw-r--r--tdehtml/css/parser.h12
-rw-r--r--tdehtml/css/parser.y12
-rw-r--r--tdehtml/css/tokenizer.cpp6
-rw-r--r--tdehtml/css/tokenizer.flex6
16 files changed, 228 insertions, 228 deletions
diff --git a/tdehtml/css/css_renderstyledeclarationimpl.cpp b/tdehtml/css/css_renderstyledeclarationimpl.cpp
index 95c1c95d9..00e6f5382 100644
--- a/tdehtml/css/css_renderstyledeclarationimpl.cpp
+++ b/tdehtml/css/css_renderstyledeclarationimpl.cpp
@@ -41,8 +41,8 @@ static const int computedProperties[] = {
CSS_PROP_BACKGROUND_POSITION_Y,
CSS_PROP_BORDER_COLLAPSE,
CSS_PROP_BORDER_SPACING,
- CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING,
- CSS_PROP__KHTML_BORDER_VERTICAL_SPACING,
+ CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING,
+ CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING,
CSS_PROP_BORDER_TOP_COLOR,
CSS_PROP_BORDER_RIGHT_COLOR,
CSS_PROP_BORDER_BOTTOM_COLOR,
@@ -80,10 +80,10 @@ static const int computedProperties[] = {
CSS_PROP_MARGIN_RIGHT,
CSS_PROP_MARGIN_BOTTOM,
CSS_PROP_MARGIN_LEFT,
- CSS_PROP__KHTML_MARQUEE_DIRECTION,
- CSS_PROP__KHTML_MARQUEE_INCREMENT,
- CSS_PROP__KHTML_MARQUEE_REPETITION,
- CSS_PROP__KHTML_MARQUEE_STYLE,
+ CSS_PROP__TDEHTML_MARQUEE_DIRECTION,
+ CSS_PROP__TDEHTML_MARQUEE_INCREMENT,
+ CSS_PROP__TDEHTML_MARQUEE_REPETITION,
+ CSS_PROP__TDEHTML_MARQUEE_STYLE,
CSS_PROP_MAX_HEIGHT,
CSS_PROP_MAX_WIDTH,
CSS_PROP_MIN_HEIGHT,
@@ -137,7 +137,7 @@ static CSSValueImpl *valueForBorderStyle(EBorderStyle style)
{
switch (style) {
case tdehtml::BNATIVE:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_NATIVE);
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_NATIVE);
case tdehtml::BNONE:
return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
case tdehtml::BHIDDEN:
@@ -176,12 +176,12 @@ static CSSValueImpl *valueForTextAlign(ETextAlign align)
return new CSSPrimitiveValueImpl(CSS_VAL_CENTER);
case tdehtml::JUSTIFY:
return new CSSPrimitiveValueImpl(CSS_VAL_JUSTIFY);
- case tdehtml::KHTML_LEFT:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_LEFT);
- case tdehtml::KHTML_RIGHT:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_RIGHT);
- case tdehtml::KHTML_CENTER:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_CENTER);
+ case tdehtml::TDEHTML_LEFT:
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_LEFT);
+ case tdehtml::TDEHTML_RIGHT:
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_RIGHT);
+ case tdehtml::TDEHTML_CENTER:
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_CENTER);
}
Q_ASSERT( 0 );
return 0;
@@ -440,10 +440,10 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
"px");
return new CSSPrimitiveValueImpl(string, CSSPrimitiveValue::CSS_STRING);
}
- case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING:
+ case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING:
return new CSSPrimitiveValueImpl(style->borderHorizontalSpacing(),
CSSPrimitiveValue::CSS_PX);
- case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING:
+ case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING:
return new CSSPrimitiveValueImpl(style->borderVerticalSpacing(),
CSSPrimitiveValue::CSS_PX);
case CSS_PROP_BORDER_TOP_COLOR:
@@ -614,9 +614,9 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
case FRIGHT:
return new CSSPrimitiveValueImpl(CSS_VAL_RIGHT);
case FLEFT_ALIGN:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_LEFT);
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_LEFT);
case FRIGHT_ALIGN:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_RIGHT);
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_RIGHT);
}
}
case CSS_PROP_FONT_FAMILY:
@@ -706,10 +706,10 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
return valueForLength(style->marginBottom(), renderer->contentHeight());
case CSS_PROP_MARGIN_LEFT:
return valueForLength(style->marginLeft(), renderer->contentWidth());
- case CSS_PROP__KHTML_MARQUEE:
+ case CSS_PROP__TDEHTML_MARQUEE:
// FIXME: unimplemented
break;
- case CSS_PROP__KHTML_MARQUEE_DIRECTION:
+ case CSS_PROP__TDEHTML_MARQUEE_DIRECTION:
switch (style->marqueeDirection()) {
case MFORWARD:
return new CSSPrimitiveValueImpl(CSS_VAL_FORWARDS);
@@ -728,16 +728,16 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
}
Q_ASSERT(0);
return 0;
- case CSS_PROP__KHTML_MARQUEE_INCREMENT:
+ case CSS_PROP__TDEHTML_MARQUEE_INCREMENT:
return valueForLength(style->marqueeIncrement(), renderer->contentWidth());
- case CSS_PROP__KHTML_MARQUEE_REPETITION:
+ case CSS_PROP__TDEHTML_MARQUEE_REPETITION:
if (style->marqueeLoopCount() < 0)
return new CSSPrimitiveValueImpl(CSS_VAL_INFINITE);
return new CSSPrimitiveValueImpl(style->marqueeLoopCount(), CSSPrimitiveValue::CSS_NUMBER);
- case CSS_PROP__KHTML_MARQUEE_SPEED:
+ case CSS_PROP__TDEHTML_MARQUEE_SPEED:
// FIXME: unimplemented
break;
- case CSS_PROP__KHTML_MARQUEE_STYLE:
+ case CSS_PROP__TDEHTML_MARQUEE_STYLE:
switch (style->marqueeBehavior()) {
case MNONE:
return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
@@ -960,7 +960,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
case BOTTOM:
return new CSSPrimitiveValueImpl(CSS_VAL_BOTTOM);
case BASELINE_MIDDLE:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_BASELINE_MIDDLE);
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_BASELINE_MIDDLE);
case LENGTH:
return valueForLength(style->verticalAlignLength(), renderer->contentWidth());
}
@@ -991,8 +991,8 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
return new CSSPrimitiveValueImpl(CSS_VAL_PRE_LINE);
case NOWRAP:
return new CSSPrimitiveValueImpl(CSS_VAL_NOWRAP);
- case KHTML_NOWRAP:
- return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_NOWRAP);
+ case TDEHTML_NOWRAP:
+ return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_NOWRAP);
}
Q_ASSERT(0);
break;
@@ -1060,9 +1060,9 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
break;
case CSS_PROP_SCROLLBAR_ARROW_COLOR:
break;
- case CSS_PROP__KHTML_FLOW_MODE:
+ case CSS_PROP__TDEHTML_FLOW_MODE:
break;
- case CSS_PROP__KHTML_USER_INPUT:
+ case CSS_PROP__TDEHTML_USER_INPUT:
break;
default:
Q_ASSERT( 0 );
diff --git a/tdehtml/css/css_valueimpl.cpp b/tdehtml/css/css_valueimpl.cpp
index 0da65c4b6..94cca8840 100644
--- a/tdehtml/css/css_valueimpl.cpp
+++ b/tdehtml/css/css_valueimpl.cpp
@@ -891,7 +891,7 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string)
parsedFontName.replace(braceReg, TQString());
#ifndef APPLE_CHANGES
- const TQString &available = KHTMLSettings::availableFamilies();
+ const TQString &available = TDEHTMLSettings::availableFamilies();
parsedFontName = parsedFontName.lower();
// kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl;
diff --git a/tdehtml/css/csshelper.h b/tdehtml/css/csshelper.h
index 772a9eba1..5bc5194d0 100644
--- a/tdehtml/css/csshelper.h
+++ b/tdehtml/css/csshelper.h
@@ -28,7 +28,7 @@
#include "dom/dom_string.h"
class TQPaintDeviceMetrics;
-class KHTMLSettings;
+class TDEHTMLSettings;
namespace DOM
{
diff --git a/tdehtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp
index b994ad773..b33151b59 100644
--- a/tdehtml/css/cssparser.cpp
+++ b/tdehtml/css/cssparser.cpp
@@ -533,7 +533,7 @@ bool CSSParser::parseValue( int propId, bool important )
* correctly and allows optimization in tdehtml::applyRule(..)
*/
case CSS_PROP_CAPTION_SIDE: // top | bottom | left | right | inherit
- // Left and right were deprecated in CSS 2.1 and never supported by KHTML
+ // Left and right were deprecated in CSS 2.1 and never supported by TDEHTML
if ( /* id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || */
id == CSS_VAL_TOP || id == CSS_VAL_BOTTOM)
valid_primitive = true;
@@ -567,7 +567,7 @@ bool CSSParser::parseValue( int propId, bool important )
// upper-roman | lower-greek | lower-alpha | lower-latin | upper-alpha |
// upper-latin | hebrew | armenian | georgian | cjk-ideographic | hiragana |
// katakana | hiragana-iroha | katakana-iroha | none | inherit
- if ((id >= CSS_VAL_DISC && id <= CSS_VAL__KHTML_CLOSE_QUOTE) || id == CSS_VAL_NONE)
+ if ((id >= CSS_VAL_DISC && id <= CSS_VAL__TDEHTML_CLOSE_QUOTE) || id == CSS_VAL_NONE)
valid_primitive = true;
break;
@@ -590,8 +590,8 @@ bool CSSParser::parseValue( int propId, bool important )
break;
case CSS_PROP_FLOAT: // left | right | none | tdehtml_left | tdehtml_right | inherit + center for buggy CSS
- if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__KHTML_LEFT ||
- id == CSS_VAL__KHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
+ if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__TDEHTML_LEFT ||
+ id == CSS_VAL__TDEHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
valid_primitive = true;
break;
@@ -603,7 +603,7 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_TEXT_ALIGN:
// left | right | center | justify | tdehtml_left | tdehtml_right | tdehtml_center | <string> | inherit
- if ( ( id >= CSS_VAL__KHTML_AUTO && id <= CSS_VAL__KHTML_CENTER ) ||
+ if ( ( id >= CSS_VAL__TDEHTML_AUTO && id <= CSS_VAL__TDEHTML_CENTER ) ||
value->unit == CSSPrimitiveValue::CSS_STRING )
valid_primitive = true;
break;
@@ -613,7 +613,7 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_BORDER_RIGHT_STYLE: // Defined as: none | hidden | dotted | dashed |
case CSS_PROP_BORDER_BOTTOM_STYLE: // solid | double | groove | ridge | inset | outset | -tdehtml-native
case CSS_PROP_BORDER_LEFT_STYLE: ////
- if (id >= CSS_VAL__KHTML_NATIVE && id <= CSS_VAL_DOUBLE)
+ if (id >= CSS_VAL__TDEHTML_NATIVE && id <= CSS_VAL_DOUBLE)
valid_primitive = true;
break;
@@ -636,8 +636,8 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_BORDER_SPACING:
{
- const int properties[2] = { CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING,
- CSS_PROP__KHTML_BORDER_VERTICAL_SPACING };
+ const int properties[2] = { CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING,
+ CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING };
if (num == 1) {
ShorthandScope scope(this, CSS_PROP_BORDER_SPACING);
if (!parseValue(properties[0], important)) return false;
@@ -653,8 +653,8 @@ bool CSSParser::parseValue( int propId, bool important )
}
return false;
}
- case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING:
- case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING:
+ case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING:
+ case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING:
valid_primitive = validUnit(value, FLength|FNonNeg, strict&(!nonCSSHint));
break;
@@ -682,10 +682,10 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_BORDER_BOTTOM_COLOR: // <color> | inherit
case CSS_PROP_BORDER_LEFT_COLOR: // <color> | inherit
case CSS_PROP_COLOR: // <color> | inherit
- if ( id == CSS_VAL__KHTML_TEXT || id == CSS_VAL_MENU ||
+ if ( id == CSS_VAL__TDEHTML_TEXT || id == CSS_VAL_MENU ||
(id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT ) ||
id == CSS_VAL_TRANSPARENT ||
- (id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && (nonCSSHint|!strict) ) ) {
+ (id >= CSS_VAL_GREY && id < CSS_VAL__TDEHTML_TEXT && (nonCSSHint|!strict) ) ) {
valid_primitive = true;
} else {
parsedValue = parseColor();
@@ -707,13 +707,13 @@ bool CSSParser::parseValue( int propId, bool important )
break;
case CSS_PROP_BACKGROUND_ATTACHMENT:
- case CSS_PROP__KHTML_BACKGROUND_CLIP:
+ case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
case CSS_PROP_BACKGROUND_IMAGE:
- case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
+ case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
case CSS_PROP_BACKGROUND_POSITION:
case CSS_PROP_BACKGROUND_POSITION_X:
case CSS_PROP_BACKGROUND_POSITION_Y:
- case CSS_PROP__KHTML_BACKGROUND_SIZE:
+ case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
case CSS_PROP_BACKGROUND_REPEAT: {
CSSValueImpl *val1 = 0, *val2 = 0;
int propId1, propId2;
@@ -769,7 +769,7 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_PADDING_RIGHT: // <padding-width> | inherit
case CSS_PROP_PADDING_BOTTOM: // Which is defined as
case CSS_PROP_PADDING_LEFT: // <length> | <percentage>
- case CSS_PROP__KHTML_PADDING_START:
+ case CSS_PROP__TDEHTML_PADDING_START:
valid_primitive = ( !id && validUnit( value, FLength|FPercent|FNonNeg, strict&(!nonCSSHint) ) );
break;
@@ -807,7 +807,7 @@ bool CSSParser::parseValue( int propId, bool important )
// baseline | sub | super | top | text-top | middle | bottom | text-bottom |
// <percentage> | <length> | inherit
- if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__KHTML_BASELINE_MIDDLE )
+ if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__TDEHTML_BASELINE_MIDDLE )
valid_primitive = true;
else
valid_primitive = ( !id && validUnit( value, FLength|FPercent, strict&(!nonCSSHint) ) );
@@ -830,7 +830,7 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_MARGIN_RIGHT: // Which is defined as
case CSS_PROP_MARGIN_BOTTOM: // <length> | <percentage> | auto | inherit
case CSS_PROP_MARGIN_LEFT: ////
- case CSS_PROP__KHTML_MARGIN_START:
+ case CSS_PROP__TDEHTML_MARGIN_START:
if ( id == CSS_VAL_AUTO )
valid_primitive = true;
else
@@ -912,8 +912,8 @@ bool CSSParser::parseValue( int propId, bool important )
valid_primitive = true;
break;
- case CSS_PROP__KHTML_FLOW_MODE:
- if ( id == CSS_VAL__KHTML_NORMAL || id == CSS_VAL__KHTML_AROUND_FLOATS )
+ case CSS_PROP__TDEHTML_FLOW_MODE:
+ if ( id == CSS_VAL__TDEHTML_NORMAL || id == CSS_VAL__TDEHTML_AROUND_FLOATS )
valid_primitive = true;
break;
@@ -934,41 +934,41 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_OPACITY:
valid_primitive = validUnit(value, FNumber, strict);
break;
- case CSS_PROP__KHTML_USER_INPUT: // none | enabled | disabled | inherit
+ case CSS_PROP__TDEHTML_USER_INPUT: // none | enabled | disabled | inherit
if ( id == CSS_VAL_NONE || id == CSS_VAL_ENABLED || id == CSS_VAL_DISABLED )
valid_primitive = true;
-// kdDebug(6080) << "CSS_PROP__KHTML_USER_INPUT: " << valid_primitive << endl;
+// kdDebug(6080) << "CSS_PROP__TDEHTML_USER_INPUT: " << valid_primitive << endl;
break;
- case CSS_PROP__KHTML_MARQUEE: {
- const int properties[5] = { CSS_PROP__KHTML_MARQUEE_DIRECTION, CSS_PROP__KHTML_MARQUEE_INCREMENT,
- CSS_PROP__KHTML_MARQUEE_REPETITION,
- CSS_PROP__KHTML_MARQUEE_STYLE, CSS_PROP__KHTML_MARQUEE_SPEED };
+ case CSS_PROP__TDEHTML_MARQUEE: {
+ const int properties[5] = { CSS_PROP__TDEHTML_MARQUEE_DIRECTION, CSS_PROP__TDEHTML_MARQUEE_INCREMENT,
+ CSS_PROP__TDEHTML_MARQUEE_REPETITION,
+ CSS_PROP__TDEHTML_MARQUEE_STYLE, CSS_PROP__TDEHTML_MARQUEE_SPEED };
return parseShortHand(propId, properties, 5, important);
}
- case CSS_PROP__KHTML_MARQUEE_DIRECTION:
+ case CSS_PROP__TDEHTML_MARQUEE_DIRECTION:
if (id == CSS_VAL_FORWARDS || id == CSS_VAL_BACKWARDS || id == CSS_VAL_AHEAD ||
id == CSS_VAL_REVERSE || id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL_DOWN ||
id == CSS_VAL_UP || id == CSS_VAL_AUTO)
valid_primitive = true;
break;
- case CSS_PROP__KHTML_MARQUEE_INCREMENT:
+ case CSS_PROP__TDEHTML_MARQUEE_INCREMENT:
if (id == CSS_VAL_SMALL || id == CSS_VAL_LARGE || id == CSS_VAL_MEDIUM)
valid_primitive = true;
else
valid_primitive = validUnit(value, FLength|FPercent, strict&(!nonCSSHint));
break;
- case CSS_PROP__KHTML_MARQUEE_STYLE:
+ case CSS_PROP__TDEHTML_MARQUEE_STYLE:
if (id == CSS_VAL_NONE || id == CSS_VAL_SLIDE || id == CSS_VAL_SCROLL || id == CSS_VAL_ALTERNATE ||
id == CSS_VAL_UNFURL)
valid_primitive = true;
break;
- case CSS_PROP__KHTML_MARQUEE_REPETITION:
+ case CSS_PROP__TDEHTML_MARQUEE_REPETITION:
if (id == CSS_VAL_INFINITE)
valid_primitive = true;
else
valid_primitive = validUnit(value, FInteger|FNonNeg, strict&(!nonCSSHint));
break;
- case CSS_PROP__KHTML_MARQUEE_SPEED:
+ case CSS_PROP__TDEHTML_MARQUEE_SPEED:
if (id == CSS_VAL_NORMAL || id == CSS_VAL_SLOW || id == CSS_VAL_FAST)
valid_primitive = true;
else
@@ -1137,11 +1137,11 @@ bool CSSParser::parseBackgroundShorthand(bool important)
{
// Position must come before color in this array because a plain old "0" is a legal color
// in quirks mode but it's usually the X coordinate of a position.
- // FIXME: Add CSS_PROP__KHTML_BACKGROUND_SIZE to the shorthand.
+ // FIXME: Add CSS_PROP__TDEHTML_BACKGROUND_SIZE to the shorthand.
const int numProperties = 7;
const int properties[numProperties] = { CSS_PROP_BACKGROUND_IMAGE, CSS_PROP_BACKGROUND_REPEAT,
- CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION, CSS_PROP__KHTML_BACKGROUND_CLIP,
- CSS_PROP__KHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR };
+ CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION, CSS_PROP__TDEHTML_BACKGROUND_CLIP,
+ CSS_PROP__TDEHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR };
ShorthandScope scope(this, CSS_PROP_BACKGROUND);
@@ -1427,7 +1427,7 @@ CSSValueImpl* CSSParser::parseCounterContent(ValueList *args, bool counters)
if (i->unit != Value::Operator || i->iValue != ',') goto invalid;
i = args->next();
if (i->unit != CSSPrimitiveValue::CSS_IDENT) goto invalid;
- if (i->id < CSS_VAL_DISC || i->id > CSS_VAL__KHTML_CLOSE_QUOTE) goto invalid;
+ if (i->id < CSS_VAL_DISC || i->id > CSS_VAL__TDEHTML_CLOSE_QUOTE) goto invalid;
counter->m_listStyle = i->id - CSS_VAL_DISC;
}
return new CSSPrimitiveValueImpl(counter);
@@ -1439,9 +1439,9 @@ invalid:
CSSValueImpl* CSSParser::parseBackgroundColor()
{
int id = valueList->current()->id;
- if (id == CSS_VAL__KHTML_TEXT || id == CSS_VAL_TRANSPARENT ||
+ if (id == CSS_VAL__TDEHTML_TEXT || id == CSS_VAL_TRANSPARENT ||
(id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT) || id == CSS_VAL_MENU ||
- (id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && !strict))
+ (id >= CSS_VAL_GREY && id < CSS_VAL__TDEHTML_TEXT && !strict))
return new CSSPrimitiveValueImpl(id);
return parseColor();
}
@@ -1615,8 +1615,8 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2,
if (currValue)
valueList->next();
break;
- case CSS_PROP__KHTML_BACKGROUND_CLIP:
- case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
+ case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
+ case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
if (val->id == CSS_VAL_BORDER || val->id == CSS_VAL_PADDING || val->id == CSS_VAL_CONTENT) {
currValue = new CSSPrimitiveValueImpl(val->id);
valueList->next();
@@ -1646,7 +1646,7 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2,
valueList->next();
}
break;
- case CSS_PROP__KHTML_BACKGROUND_SIZE:
+ case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
currValue = parseBackgroundSize();
if (currValue)
valueList->next();
@@ -2268,7 +2268,7 @@ bool CSSParser::parseShadow(int propId, bool important)
// The only other type of value that's ok is a color value.
CSSPrimitiveValueImpl* parsedColor = 0;
bool isColor = (val->id >= CSS_VAL_AQUA && val->id <= CSS_VAL_WINDOWTEXT || val->id == CSS_VAL_MENU ||
- (val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__KHTML_TEXT && !strict));
+ (val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__TDEHTML_TEXT && !strict));
if (!context.allowColor)
return context.failed();
diff --git a/tdehtml/css/cssproperties.c b/tdehtml/css/cssproperties.c
index da5208412..384982aba 100644
--- a/tdehtml/css/cssproperties.c
+++ b/tdehtml/css/cssproperties.c
@@ -295,7 +295,7 @@ findProp (register const char *str, register unsigned int len)
#line 104 "cssproperties.gperf"
{"text-indent", CSS_PROP_TEXT_INDENT},
#line 69 "cssproperties.gperf"
- {"-tdehtml-margin-start", CSS_PROP__KHTML_MARGIN_START},
+ {"-tdehtml-margin-start", CSS_PROP__TDEHTML_MARGIN_START},
#line 14 "cssproperties.gperf"
{"background-color", CSS_PROP_BACKGROUND_COLOR},
#line 100 "cssproperties.gperf"
@@ -305,7 +305,7 @@ findProp (register const char *str, register unsigned int len)
#line 47 "cssproperties.gperf"
{"counter-reset", CSS_PROP_COUNTER_RESET},
#line 93 "cssproperties.gperf"
- {"-tdehtml-padding-start", CSS_PROP__KHTML_PADDING_START},
+ {"-tdehtml-padding-start", CSS_PROP__TDEHTML_PADDING_START},
#line 15 "cssproperties.gperf"
{"background-image", CSS_PROP_BACKGROUND_IMAGE},
#line 96 "cssproperties.gperf"
@@ -319,11 +319,11 @@ findProp (register const char *str, register unsigned int len)
#line 52 "cssproperties.gperf"
{"float", CSS_PROP_FLOAT},
#line 21 "cssproperties.gperf"
- {"-tdehtml-background-clip", CSS_PROP__KHTML_BACKGROUND_CLIP},
+ {"-tdehtml-background-clip", CSS_PROP__TDEHTML_BACKGROUND_CLIP},
#line 70 "cssproperties.gperf"
- {"-tdehtml-marquee", CSS_PROP__KHTML_MARQUEE},
+ {"-tdehtml-marquee", CSS_PROP__TDEHTML_MARQUEE},
#line 27 "cssproperties.gperf"
- {"-tdehtml-border-vertical-spacing", CSS_PROP__KHTML_BORDER_VERTICAL_SPACING},
+ {"-tdehtml-border-vertical-spacing", CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING},
#line 46 "cssproperties.gperf"
{"counter-increment", CSS_PROP_COUNTER_INCREMENT},
#line 128 "cssproperties.gperf"
@@ -337,7 +337,7 @@ findProp (register const char *str, register unsigned int len)
#line 31 "cssproperties.gperf"
{"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},
#line 22 "cssproperties.gperf"
- {"-tdehtml-background-origin", CSS_PROP__KHTML_BACKGROUND_ORIGIN},
+ {"-tdehtml-background-origin", CSS_PROP__TDEHTML_BACKGROUND_ORIGIN},
#line 17 "cssproperties.gperf"
{"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT},
#line 126 "cssproperties.gperf"
@@ -353,7 +353,7 @@ findProp (register const char *str, register unsigned int len)
#line 68 "cssproperties.gperf"
{"margin-left", CSS_PROP_MARGIN_LEFT},
#line 142 "cssproperties.gperf"
- {"-tdehtml-user-input", CSS_PROP__KHTML_USER_INPUT},
+ {"-tdehtml-user-input", CSS_PROP__TDEHTML_USER_INPUT},
#line 79 "cssproperties.gperf"
{"min-width", CSS_PROP_MIN_WIDTH},
#line 127 "cssproperties.gperf"
@@ -361,13 +361,13 @@ findProp (register const char *str, register unsigned int len)
#line 92 "cssproperties.gperf"
{"padding-left", CSS_PROP_PADDING_LEFT},
#line 71 "cssproperties.gperf"
- {"-tdehtml-marquee-direction", CSS_PROP__KHTML_MARQUEE_DIRECTION},
+ {"-tdehtml-marquee-direction", CSS_PROP__TDEHTML_MARQUEE_DIRECTION},
#line 73 "cssproperties.gperf"
- {"-tdehtml-marquee-repetition", CSS_PROP__KHTML_MARQUEE_REPETITION},
+ {"-tdehtml-marquee-repetition", CSS_PROP__TDEHTML_MARQUEE_REPETITION},
#line 95 "cssproperties.gperf"
{"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE},
#line 74 "cssproperties.gperf"
- {"-tdehtml-marquee-speed", CSS_PROP__KHTML_MARQUEE_SPEED},
+ {"-tdehtml-marquee-speed", CSS_PROP__TDEHTML_MARQUEE_SPEED},
#line 94 "cssproperties.gperf"
{"page-break-after", CSS_PROP_PAGE_BREAK_AFTER},
#line 81 "cssproperties.gperf"
@@ -383,7 +383,7 @@ findProp (register const char *str, register unsigned int len)
#line 134 "cssproperties.gperf"
{"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},
#line 72 "cssproperties.gperf"
- {"-tdehtml-marquee-increment", CSS_PROP__KHTML_MARQUEE_INCREMENT},
+ {"-tdehtml-marquee-increment", CSS_PROP__TDEHTML_MARQUEE_INCREMENT},
#line 116 "cssproperties.gperf"
{"word-spacing", CSS_PROP_WORD_SPACING},
#line 111 "cssproperties.gperf"
@@ -405,13 +405,13 @@ findProp (register const char *str, register unsigned int len)
#line 32 "cssproperties.gperf"
{"border-top-style", CSS_PROP_BORDER_TOP_STYLE},
#line 26 "cssproperties.gperf"
- {"-tdehtml-border-horizontal-spacing", CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING},
+ {"-tdehtml-border-horizontal-spacing", CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING},
#line 33 "cssproperties.gperf"
{"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE},
#line 34 "cssproperties.gperf"
{"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE},
#line 23 "cssproperties.gperf"
- {"-tdehtml-background-size", CSS_PROP__KHTML_BACKGROUND_SIZE},
+ {"-tdehtml-background-size", CSS_PROP__TDEHTML_BACKGROUND_SIZE},
#line 135 "cssproperties.gperf"
{"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR},
#line 129 "cssproperties.gperf"
@@ -435,7 +435,7 @@ findProp (register const char *str, register unsigned int len)
#line 84 "cssproperties.gperf"
{"outline-style", CSS_PROP_OUTLINE_STYLE},
#line 141 "cssproperties.gperf"
- {"-tdehtml-flow-mode", CSS_PROP__KHTML_FLOW_MODE},
+ {"-tdehtml-flow-mode", CSS_PROP__TDEHTML_FLOW_MODE},
#line 87 "cssproperties.gperf"
{"overflow-x", CSS_PROP_OVERFLOW_X},
#line 113 "cssproperties.gperf"
@@ -449,7 +449,7 @@ findProp (register const char *str, register unsigned int len)
#line 83 "cssproperties.gperf"
{"outline-offset", CSS_PROP_OUTLINE_OFFSET},
#line 75 "cssproperties.gperf"
- {"-tdehtml-marquee-style", CSS_PROP__KHTML_MARQUEE_STYLE},
+ {"-tdehtml-marquee-style", CSS_PROP__TDEHTML_MARQUEE_STYLE},
#line 55 "cssproperties.gperf"
{"font-style", CSS_PROP_FONT_STYLE},
#line 35 "cssproperties.gperf"
diff --git a/tdehtml/css/cssproperties.h b/tdehtml/css/cssproperties.h
index be92d93d4..c06431c62 100644
--- a/tdehtml/css/cssproperties.h
+++ b/tdehtml/css/cssproperties.h
@@ -15,13 +15,13 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
#define CSS_PROP_BACKGROUND_POSITION 5
#define CSS_PROP_BACKGROUND_POSITION_X 6
#define CSS_PROP_BACKGROUND_POSITION_Y 7
-#define CSS_PROP__KHTML_BACKGROUND_CLIP 8
-#define CSS_PROP__KHTML_BACKGROUND_ORIGIN 9
-#define CSS_PROP__KHTML_BACKGROUND_SIZE 10
+#define CSS_PROP__TDEHTML_BACKGROUND_CLIP 8
+#define CSS_PROP__TDEHTML_BACKGROUND_ORIGIN 9
+#define CSS_PROP__TDEHTML_BACKGROUND_SIZE 10
#define CSS_PROP_BORDER_COLLAPSE 11
#define CSS_PROP_BORDER_SPACING 12
-#define CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING 13
-#define CSS_PROP__KHTML_BORDER_VERTICAL_SPACING 14
+#define CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING 13
+#define CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING 14
#define CSS_PROP_BORDER_TOP_COLOR 15
#define CSS_PROP_BORDER_RIGHT_COLOR 16
#define CSS_PROP_BORDER_BOTTOM_COLOR 17
@@ -63,13 +63,13 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
#define CSS_PROP_MARGIN_RIGHT 53
#define CSS_PROP_MARGIN_BOTTOM 54
#define CSS_PROP_MARGIN_LEFT 55
-#define CSS_PROP__KHTML_MARGIN_START 56
-#define CSS_PROP__KHTML_MARQUEE 57
-#define CSS_PROP__KHTML_MARQUEE_DIRECTION 58
-#define CSS_PROP__KHTML_MARQUEE_INCREMENT 59
-#define CSS_PROP__KHTML_MARQUEE_REPETITION 60
-#define CSS_PROP__KHTML_MARQUEE_SPEED 61
-#define CSS_PROP__KHTML_MARQUEE_STYLE 62
+#define CSS_PROP__TDEHTML_MARGIN_START 56
+#define CSS_PROP__TDEHTML_MARQUEE 57
+#define CSS_PROP__TDEHTML_MARQUEE_DIRECTION 58
+#define CSS_PROP__TDEHTML_MARQUEE_INCREMENT 59
+#define CSS_PROP__TDEHTML_MARQUEE_REPETITION 60
+#define CSS_PROP__TDEHTML_MARQUEE_SPEED 61
+#define CSS_PROP__TDEHTML_MARQUEE_STYLE 62
#define CSS_PROP_MAX_HEIGHT 63
#define CSS_PROP_MAX_WIDTH 64
#define CSS_PROP_MIN_HEIGHT 65
@@ -87,7 +87,7 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
#define CSS_PROP_PADDING_RIGHT 77
#define CSS_PROP_PADDING_BOTTOM 78
#define CSS_PROP_PADDING_LEFT 79
-#define CSS_PROP__KHTML_PADDING_START 80
+#define CSS_PROP__TDEHTML_PADDING_START 80
#define CSS_PROP_PAGE_BREAK_AFTER 81
#define CSS_PROP_PAGE_BREAK_BEFORE 82
#define CSS_PROP_PAGE_BREAK_INSIDE 83
@@ -135,8 +135,8 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
#define CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR 125
#define CSS_PROP_SCROLLBAR_TRACK_COLOR 126
#define CSS_PROP_SCROLLBAR_ARROW_COLOR 127
-#define CSS_PROP__KHTML_FLOW_MODE 128
-#define CSS_PROP__KHTML_USER_INPUT 129
+#define CSS_PROP__TDEHTML_FLOW_MODE 128
+#define CSS_PROP__TDEHTML_USER_INPUT 129
#define CSS_PROP_MAX CSS_PROP_Z_INDEX
#define CSS_PROP_TOTAL 130
diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp
index 04b66e40a..2a1fb5477 100644
--- a/tdehtml/css/cssstyleselector.cpp
+++ b/tdehtml/css/cssstyleselector.cpp
@@ -211,7 +211,7 @@ static PseudoState pseudoState;
CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet, StyleSheetListImpl *styleSheets,
const KURL &url, bool _strictParsing )
{
- KHTMLView* view = doc->view();
+ TDEHTMLView* view = doc->view();
init(view ? view->part()->settings() : 0, doc);
@@ -273,14 +273,14 @@ CSSStyleSelector::CSSStyleSelector( CSSStyleSheetImpl *sheet )
{
init(0L, 0L);
- KHTMLView *view = sheet->doc()->view();
+ TDEHTMLView *view = sheet->doc()->view();
m_medium = view ? view->mediaType() : "screen";
authorStyle = new CSSStyleSelectorList();
authorStyle->append( sheet, m_medium );
}
-void CSSStyleSelector::init(const KHTMLSettings* _settings, DocumentImpl* doc)
+void CSSStyleSelector::init(const TDEHTMLSettings* _settings, DocumentImpl* doc)
{
element = 0;
settings = _settings;
@@ -308,12 +308,12 @@ CSSStyleSelector::~CSSStyleSelector()
void CSSStyleSelector::addSheet( CSSStyleSheetImpl *sheet )
{
- KHTMLView *view = sheet->doc()->view();
+ TDEHTMLView *view = sheet->doc()->view();
m_medium = view ? view->mediaType() : "screen";
authorStyle->append( sheet, m_medium );
}
-void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *doc)
+void CSSStyleSelector::loadDefaultStyle(const TDEHTMLSettings *s, DocumentImpl *doc)
{
if(s_defaultStyle) return;
@@ -883,9 +883,9 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
cleanpath( u );
}
//completeURL( attr.string() );
- bool contains = KHTMLFactory::vLinks()->contains( u );
+ bool contains = TDEHTMLFactory::vLinks()->contains( u );
if ( !contains && u.contains('/')==2 )
- contains = KHTMLFactory::vLinks()->contains( u+'/' );
+ contains = TDEHTMLFactory::vLinks()->contains( u+'/' );
return contains ? PseudoVisited : PseudoLink;
}
@@ -2136,9 +2136,9 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
(!parentNode && value->cssValueType() == CSSValue::CSS_INHERIT);
// These properties are used to set the correct margins/padding on RTL lists.
- if (id == CSS_PROP__KHTML_MARGIN_START)
+ if (id == CSS_PROP__TDEHTML_MARGIN_START)
id = style->direction() == LTR ? CSS_PROP_MARGIN_LEFT : CSS_PROP_MARGIN_RIGHT;
- else if (id == CSS_PROP__KHTML_PADDING_START)
+ else if (id == CSS_PROP__TDEHTML_PADDING_START)
id = style->direction() == LTR ? CSS_PROP_PADDING_LEFT : CSS_PROP_PADDING_RIGHT;
// What follows is a list that maps the CSS properties into their corresponding front-end
@@ -2150,16 +2150,16 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
case CSS_PROP_BACKGROUND_ATTACHMENT:
HANDLE_BACKGROUND_VALUE(backgroundAttachment, BackgroundAttachment, value)
break;
- case CSS_PROP__KHTML_BACKGROUND_CLIP:
+ case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
HANDLE_BACKGROUND_VALUE(backgroundClip, BackgroundClip, value)
break;
- case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
+ case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
HANDLE_BACKGROUND_VALUE(backgroundOrigin, BackgroundOrigin, value)
break;
case CSS_PROP_BACKGROUND_REPEAT:
HANDLE_BACKGROUND_VALUE(backgroundRepeat, BackgroundRepeat, value)
break;
- case CSS_PROP__KHTML_BACKGROUND_SIZE:
+ case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
HANDLE_BACKGROUND_VALUE(backgroundSize, BackgroundSize, value)
break;
case CSS_PROP_BORDER_COLLAPSE:
@@ -2181,27 +2181,27 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
case CSS_PROP_BORDER_TOP_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderTopStyle, BorderTopStyle, BorderStyle)
if (!primitiveValue) return;
- style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+ style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_BORDER_RIGHT_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderRightStyle, BorderRightStyle, BorderStyle)
if (!primitiveValue) return;
- style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+ style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_BORDER_BOTTOM_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderBottomStyle, BorderBottomStyle, BorderStyle)
if (!primitiveValue) return;
- style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+ style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_BORDER_LEFT_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderLeftStyle, BorderLeftStyle, BorderStyle)
if (!primitiveValue) return;
- style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+ style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_OUTLINE_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(outlineStyle, OutlineStyle, BorderStyle)
if (!primitiveValue) return;
- style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+ style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_CAPTION_SIDE:
{
@@ -2279,11 +2279,11 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
EFloat f;
switch(primitiveValue->getIdent())
{
- case CSS_VAL__KHTML_LEFT:
+ case CSS_VAL__TDEHTML_LEFT:
f = FLEFT_ALIGN; break;
case CSS_VAL_LEFT:
f = FLEFT; break;
- case CSS_VAL__KHTML_RIGHT:
+ case CSS_VAL__TDEHTML_RIGHT:
f = FRIGHT_ALIGN; break;
case CSS_VAL_RIGHT:
f = FRIGHT; break;
@@ -2659,8 +2659,8 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
EWhiteSpace s;
switch(primitiveValue->getIdent()) {
- case CSS_VAL__KHTML_NOWRAP:
- s = KHTML_NOWRAP;
+ case CSS_VAL__TDEHTML_NOWRAP:
+ s = TDEHTML_NOWRAP;
break;
case CSS_VAL_NOWRAP:
s = NOWRAP;
@@ -2700,14 +2700,14 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setBorderVerticalSpacing(parentStyle->borderVerticalSpacing());
break;
}
- case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING: {
+ case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING: {
HANDLE_INHERIT_AND_INITIAL(borderHorizontalSpacing, BorderHorizontalSpacing)
if (!primitiveValue) break;
short spacing = primitiveValue->computeLength(style, paintDeviceMetrics);
style->setBorderHorizontalSpacing(spacing);
break;
}
- case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: {
+ case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING: {
HANDLE_INHERIT_AND_INITIAL(borderVerticalSpacing, BorderVerticalSpacing)
if (!primitiveValue) break;
short spacing = primitiveValue->computeLength(style, paintDeviceMetrics);
@@ -2759,7 +2759,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
return;
int ident = primitiveValue->getIdent();
if ( ident ) {
- if ( ident == CSS_VAL__KHTML_TEXT )
+ if ( ident == CSS_VAL__TDEHTML_TEXT )
col = element->getDocument()->textColor();
// ### should be eliminated
else if ( ident == CSS_VAL_TRANSPARENT
@@ -3152,7 +3152,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
align = SUB; break;
case CSS_VAL_SUPER:
align = SUPER; break;
- case CSS_VAL__KHTML_BASELINE_MIDDLE:
+ case CSS_VAL__TDEHTML_BASELINE_MIDDLE:
align = BASELINE_MIDDLE; break;
default:
return;
@@ -3210,7 +3210,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
case CSS_VAL_LARGE: size = int( fontSizes[4] ); break;
case CSS_VAL_X_LARGE: size = int( fontSizes[5] ); break;
case CSS_VAL_XX_LARGE: size = int( fontSizes[6] ); break;
- case CSS_VAL__KHTML_XXX_LARGE: size = int( fontSizes[7] ); break;
+ case CSS_VAL__TDEHTML_XXX_LARGE: size = int( fontSizes[7] ); break;
case CSS_VAL_LARGER:
size = nextFontSize(fontSizes, oldSize, false);
break;
@@ -3326,7 +3326,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
HANDLE_INHERIT_AND_INITIAL(textAlign, TextAlign)
if (!primitiveValue) return;
if (primitiveValue->getIdent())
- style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__KHTML_AUTO) );
+ style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__TDEHTML_AUTO) );
return;
}
@@ -3581,15 +3581,15 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setTextDecoration(t);
break;
}
- case CSS_PROP__KHTML_FLOW_MODE:
+ case CSS_PROP__TDEHTML_FLOW_MODE:
HANDLE_INHERIT_AND_INITIAL(flowAroundFloats, FlowAroundFloats)
if (!primitiveValue) return;
if (primitiveValue->getIdent()) {
- style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__KHTML_AROUND_FLOATS );
+ style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__TDEHTML_AROUND_FLOATS );
return;
}
break;
- case CSS_PROP__KHTML_USER_INPUT: {
+ case CSS_PROP__TDEHTML_USER_INPUT: {
if(value->cssValueType() == CSSValue::CSS_INHERIT)
{
if(!parentNode) return;
@@ -3843,7 +3843,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
// Clamp opacity to the range 0-1
style->setOpacity(kMin(1.0f, kMax(0.0f, (float)primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER))));
break;
- case CSS_PROP__KHTML_MARQUEE:
+ case CSS_PROP__TDEHTML_MARQUEE:
if (value->cssValueType() != CSSValue::CSS_INHERIT || !parentNode) return;
style->setMarqueeDirection(parentStyle->marqueeDirection());
style->setMarqueeIncrement(parentStyle->marqueeIncrement());
@@ -3851,7 +3851,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setMarqueeLoopCount(parentStyle->marqueeLoopCount());
style->setMarqueeBehavior(parentStyle->marqueeBehavior());
break;
- case CSS_PROP__KHTML_MARQUEE_REPETITION: {
+ case CSS_PROP__TDEHTML_MARQUEE_REPETITION: {
HANDLE_INHERIT_AND_INITIAL(marqueeLoopCount, MarqueeLoopCount)
if (!primitiveValue) return;
if (primitiveValue->getIdent() == CSS_VAL_INFINITE)
@@ -3860,7 +3860,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setMarqueeLoopCount((int)(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)));
break;
}
- case CSS_PROP__KHTML_MARQUEE_SPEED: {
+ case CSS_PROP__TDEHTML_MARQUEE_SPEED: {
HANDLE_INHERIT_AND_INITIAL(marqueeSpeed, MarqueeSpeed)
if (!primitiveValue) return;
if (primitiveValue->getIdent()) {
@@ -3885,7 +3885,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setMarqueeSpeed(int(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)));
break;
}
- case CSS_PROP__KHTML_MARQUEE_INCREMENT: {
+ case CSS_PROP__TDEHTML_MARQUEE_INCREMENT: {
HANDLE_INHERIT_AND_INITIAL(marqueeIncrement, MarqueeIncrement)
if (!primitiveValue) return;
if (primitiveValue->getIdent()) {
@@ -3910,7 +3910,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
}
break;
}
- case CSS_PROP__KHTML_MARQUEE_STYLE: {
+ case CSS_PROP__TDEHTML_MARQUEE_STYLE: {
HANDLE_INHERIT_AND_INITIAL(marqueeBehavior, MarqueeBehavior)
if (!primitiveValue || !primitiveValue->getIdent()) return;
switch (primitiveValue->getIdent())
@@ -3933,7 +3933,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
}
break;
}
- case CSS_PROP__KHTML_MARQUEE_DIRECTION: {
+ case CSS_PROP__TDEHTML_MARQUEE_DIRECTION: {
HANDLE_INHERIT_AND_INITIAL(marqueeDirection, MarqueeDirection)
if (!primitiveValue || !primitiveValue->getIdent()) return;
switch (primitiveValue->getIdent())
diff --git a/tdehtml/css/cssstyleselector.h b/tdehtml/css/cssstyleselector.h
index ad6903de7..f826c0323 100644
--- a/tdehtml/css/cssstyleselector.h
+++ b/tdehtml/css/cssstyleselector.h
@@ -30,10 +30,10 @@
#include "dom/dom_string.h"
#include "xml/dom_restyler.h"
-class KHTMLSettings;
-class KHTMLView;
-class KHTMLPart;
-class KHTMLFactory;
+class TDEHTMLSettings;
+class TDEHTMLView;
+class TDEHTMLPart;
+class TDEHTMLFactory;
class KURL;
namespace DOM {
@@ -127,7 +127,7 @@ namespace tdehtml
KDE_EXPORT static void clear();
static void reparseConfiguration();
- static void loadDefaultStyle(const KHTMLSettings *s, DOM::DocumentImpl *doc);
+ static void loadDefaultStyle(const TDEHTMLSettings *s, DOM::DocumentImpl *doc);
RenderStyle *styleForElement(DOM::ElementImpl *e);
@@ -189,7 +189,7 @@ namespace tdehtml
public:
private:
- void init(const KHTMLSettings* settings, DOM::DocumentImpl* doc);
+ void init(const TDEHTMLSettings* settings, DOM::DocumentImpl* doc);
void mapBackgroundAttachment(BackgroundLayer* layer, DOM::CSSValueImpl* value);
void mapBackgroundClip(BackgroundLayer* layer, DOM::CSSValueImpl* value);
@@ -246,9 +246,9 @@ public:
RenderStyle *parentStyle;
DOM::ElementImpl *element;
DOM::NodeImpl *parentNode;
- KHTMLView *view;
- KHTMLPart *part;
- const KHTMLSettings *settings;
+ TDEHTMLView *view;
+ TDEHTMLPart *part;
+ const TDEHTMLSettings *settings;
TQPaintDeviceMetrics *paintDeviceMetrics;
TQValueVector<int> m_fontSizes;
TQValueVector<int> m_fixedFontSizes;
diff --git a/tdehtml/css/cssvalues.c b/tdehtml/css/cssvalues.c
index 28ceede3d..1cd8075e8 100644
--- a/tdehtml/css/cssvalues.c
+++ b/tdehtml/css/cssvalues.c
@@ -597,9 +597,9 @@ findValue (register const char *str, register unsigned int len)
#line 35 "cssvalues.gperf"
{"small-caps", CSS_VAL_SMALL_CAPS},
#line 122 "cssvalues.gperf"
- {"-tdehtml-text", CSS_VAL__KHTML_TEXT},
+ {"-tdehtml-text", CSS_VAL__TDEHTML_TEXT},
#line 141 "cssvalues.gperf"
- {"-tdehtml-left", CSS_VAL__KHTML_LEFT},
+ {"-tdehtml-left", CSS_VAL__TDEHTML_LEFT},
#line 97 "cssvalues.gperf"
{"background", CSS_VAL_BACKGROUND},
#line 178 "cssvalues.gperf"
@@ -615,9 +615,9 @@ findValue (register const char *str, register unsigned int len)
#line 198 "cssvalues.gperf"
{"table-caption", CSS_VAL_TABLE_CAPTION},
#line 154 "cssvalues.gperf"
- {"-tdehtml-lao", CSS_VAL__KHTML_LAO},
+ {"-tdehtml-lao", CSS_VAL__TDEHTML_LAO},
#line 143 "cssvalues.gperf"
- {"-tdehtml-center", CSS_VAL__KHTML_CENTER},
+ {"-tdehtml-center", CSS_VAL__TDEHTML_CENTER},
#line 54 "cssvalues.gperf"
{"x-large", CSS_VAL_X_LARGE},
#line 30 "cssvalues.gperf"
@@ -625,29 +625,29 @@ findValue (register const char *str, register unsigned int len)
#line 203 "cssvalues.gperf"
{"progress", CSS_VAL_PROGRESS},
#line 16 "cssvalues.gperf"
- {"-tdehtml-native", CSS_VAL__KHTML_NATIVE},
+ {"-tdehtml-native", CSS_VAL__TDEHTML_NATIVE},
#line 177 "cssvalues.gperf"
{"hiragana", CSS_VAL_HIRAGANA},
#line 171 "cssvalues.gperf"
{"lower-greek", CSS_VAL_LOWER_GREEK},
#line 150 "cssvalues.gperf"
- {"-tdehtml-diamond", CSS_VAL__KHTML_DIAMOND},
+ {"-tdehtml-diamond", CSS_VAL__TDEHTML_DIAMOND},
#line 224 "cssvalues.gperf"
{"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
#line 61 "cssvalues.gperf"
{"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
#line 158 "cssvalues.gperf"
- {"-tdehtml-tibetan", CSS_VAL__KHTML_TIBETAN},
+ {"-tdehtml-tibetan", CSS_VAL__TDEHTML_TIBETAN},
#line 124 "cssvalues.gperf"
{"repeat-x", CSS_VAL_REPEAT_X},
#line 266 "cssvalues.gperf"
- {"-tdehtml-normal", CSS_VAL__KHTML_NORMAL},
+ {"-tdehtml-normal", CSS_VAL__TDEHTML_NORMAL},
#line 113 "cssvalues.gperf"
{"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
#line 219 "cssvalues.gperf"
{"uppercase", CSS_VAL_UPPERCASE},
#line 136 "cssvalues.gperf"
- {"-tdehtml-auto", CSS_VAL__KHTML_AUTO},
+ {"-tdehtml-auto", CSS_VAL__TDEHTML_AUTO},
#line 163 "cssvalues.gperf"
{"georgian", CSS_VAL_GEORGIAN},
#line 229 "cssvalues.gperf"
@@ -657,13 +657,13 @@ findValue (register const char *str, register unsigned int len)
#line 109 "cssvalues.gperf"
{"infobackground", CSS_VAL_INFOBACKGROUND},
#line 157 "cssvalues.gperf"
- {"-tdehtml-thai", CSS_VAL__KHTML_THAI},
+ {"-tdehtml-thai", CSS_VAL__TDEHTML_THAI},
#line 226 "cssvalues.gperf"
{"open-quote", CSS_VAL_OPEN_QUOTE},
#line 173 "cssvalues.gperf"
{"lower-alpha", CSS_VAL_LOWER_ALPHA},
#line 156 "cssvalues.gperf"
- {"-tdehtml-urdu", CSS_VAL__KHTML_URDU},
+ {"-tdehtml-urdu", CSS_VAL__TDEHTML_URDU},
#line 223 "cssvalues.gperf"
{"close-quote", CSS_VAL_CLOSE_QUOTE},
#line 104 "cssvalues.gperf"
@@ -671,13 +671,13 @@ findValue (register const char *str, register unsigned int len)
#line 225 "cssvalues.gperf"
{"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
#line 231 "cssvalues.gperf"
- {"-tdehtml-nowrap", CSS_VAL__KHTML_NOWRAP},
+ {"-tdehtml-nowrap", CSS_VAL__TDEHTML_NOWRAP},
#line 67 "cssvalues.gperf"
{"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
#line 105 "cssvalues.gperf"
{"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
#line 155 "cssvalues.gperf"
- {"-tdehtml-persian", CSS_VAL__KHTML_PERSIAN},
+ {"-tdehtml-persian", CSS_VAL__TDEHTML_PERSIAN},
#line 116 "cssvalues.gperf"
{"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
#line 96 "cssvalues.gperf"
@@ -691,13 +691,13 @@ findValue (register const char *str, register unsigned int len)
#line 251 "cssvalues.gperf"
{"line-through", CSS_VAL_LINE_THROUGH},
#line 142 "cssvalues.gperf"
- {"-tdehtml-right", CSS_VAL__KHTML_RIGHT},
+ {"-tdehtml-right", CSS_VAL__TDEHTML_RIGHT},
#line 160 "cssvalues.gperf"
{"upper-roman", CSS_VAL_UPPER_ROMAN},
#line 135 "cssvalues.gperf"
- {"-tdehtml-baseline-middle", CSS_VAL__KHTML_BASELINE_MIDDLE},
+ {"-tdehtml-baseline-middle", CSS_VAL__TDEHTML_BASELINE_MIDDLE},
#line 153 "cssvalues.gperf"
- {"-tdehtml-arabic-indic", CSS_VAL__KHTML_ARABIC_INDIC},
+ {"-tdehtml-arabic-indic", CSS_VAL__TDEHTML_ARABIC_INDIC},
#line 152 "cssvalues.gperf"
{"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
#line 115 "cssvalues.gperf"
@@ -707,13 +707,13 @@ findValue (register const char *str, register unsigned int len)
#line 99 "cssvalues.gperf"
{"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
#line 56 "cssvalues.gperf"
- {"-tdehtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE},
+ {"-tdehtml-xxx-large", CSS_VAL__TDEHTML_XXX_LARGE},
#line 267 "cssvalues.gperf"
- {"-tdehtml-around-floats", CSS_VAL__KHTML_AROUND_FLOATS},
+ {"-tdehtml-around-floats", CSS_VAL__TDEHTML_AROUND_FLOATS},
#line 191 "cssvalues.gperf"
{"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
#line 182 "cssvalues.gperf"
- {"-tdehtml-close-quote", CSS_VAL__KHTML_CLOSE_QUOTE},
+ {"-tdehtml-close-quote", CSS_VAL__TDEHTML_CLOSE_QUOTE},
#line 179 "cssvalues.gperf"
{"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
#line 193 "cssvalues.gperf"
@@ -723,23 +723,23 @@ findValue (register const char *str, register unsigned int len)
#line 175 "cssvalues.gperf"
{"upper-alpha", CSS_VAL_UPPER_ALPHA},
#line 181 "cssvalues.gperf"
- {"-tdehtml-open-quote", CSS_VAL__KHTML_OPEN_QUOTE},
+ {"-tdehtml-open-quote", CSS_VAL__TDEHTML_OPEN_QUOTE},
#line 165 "cssvalues.gperf"
- {"-tdehtml-japanese-formal", CSS_VAL__KHTML_JAPANESE_FORMAL},
+ {"-tdehtml-japanese-formal", CSS_VAL__TDEHTML_JAPANESE_FORMAL},
#line 166 "cssvalues.gperf"
- {"-tdehtml-japanese-informal", CSS_VAL__KHTML_JAPANESE_INFORMAL},
+ {"-tdehtml-japanese-informal", CSS_VAL__TDEHTML_JAPANESE_INFORMAL},
#line 192 "cssvalues.gperf"
{"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
#line 169 "cssvalues.gperf"
- {"-tdehtml-trad-chinese-formal", CSS_VAL__KHTML_TRAD_CHINESE_FORMAL},
+ {"-tdehtml-trad-chinese-formal", CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL},
#line 170 "cssvalues.gperf"
- {"-tdehtml-trad-chinese-informal", CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL},
+ {"-tdehtml-trad-chinese-informal", CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL},
#line 167 "cssvalues.gperf"
- {"-tdehtml-simp-chinese-formal", CSS_VAL__KHTML_SIMP_CHINESE_FORMAL},
+ {"-tdehtml-simp-chinese-formal", CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL},
#line 168 "cssvalues.gperf"
- {"-tdehtml-simp-chinese-informal", CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL},
+ {"-tdehtml-simp-chinese-informal", CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL},
#line 172 "cssvalues.gperf"
- {"-tdehtml-upper-greek", CSS_VAL__KHTML_UPPER_GREEK}
+ {"-tdehtml-upper-greek", CSS_VAL__TDEHTML_UPPER_GREEK}
};
static const short lookup[] =
diff --git a/tdehtml/css/cssvalues.h b/tdehtml/css/cssvalues.h
index 36a365754..12d606acc 100644
--- a/tdehtml/css/cssvalues.h
+++ b/tdehtml/css/cssvalues.h
@@ -11,7 +11,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_MIN 1
#define CSS_VAL_INHERIT 1
#define CSS_VAL_INITIAL 2
-#define CSS_VAL__KHTML_NATIVE 3
+#define CSS_VAL__TDEHTML_NATIVE 3
#define CSS_VAL_NONE 4
#define CSS_VAL_HIDDEN 5
#define CSS_VAL_INSET 6
@@ -51,7 +51,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_LARGE 40
#define CSS_VAL_X_LARGE 41
#define CSS_VAL_XX_LARGE 42
-#define CSS_VAL__KHTML_XXX_LARGE 43
+#define CSS_VAL__TDEHTML_XXX_LARGE 43
#define CSS_VAL_SMALLER 44
#define CSS_VAL_LARGER 45
#define CSS_VAL_WIDER 46
@@ -117,7 +117,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_WINDOWFRAME 106
#define CSS_VAL_WINDOWTEXT 107
#define CSS_VAL_GREY 108
-#define CSS_VAL__KHTML_TEXT 109
+#define CSS_VAL__TDEHTML_TEXT 109
#define CSS_VAL_REPEAT 110
#define CSS_VAL_REPEAT_X 111
#define CSS_VAL_REPEAT_Y 112
@@ -130,44 +130,44 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_TEXT_BOTTOM 119
#define CSS_VAL_TOP 120
#define CSS_VAL_BOTTOM 121
-#define CSS_VAL__KHTML_BASELINE_MIDDLE 122
-#define CSS_VAL__KHTML_AUTO 123
+#define CSS_VAL__TDEHTML_BASELINE_MIDDLE 122
+#define CSS_VAL__TDEHTML_AUTO 123
#define CSS_VAL_LEFT 124
#define CSS_VAL_RIGHT 125
#define CSS_VAL_CENTER 126
#define CSS_VAL_JUSTIFY 127
-#define CSS_VAL__KHTML_LEFT 128
-#define CSS_VAL__KHTML_RIGHT 129
-#define CSS_VAL__KHTML_CENTER 130
+#define CSS_VAL__TDEHTML_LEFT 128
+#define CSS_VAL__TDEHTML_RIGHT 129
+#define CSS_VAL__TDEHTML_CENTER 130
#define CSS_VAL_OUTSIDE 131
#define CSS_VAL_INSIDE 132
#define CSS_VAL_DISC 133
#define CSS_VAL_CIRCLE 134
#define CSS_VAL_SQUARE 135
#define CSS_VAL_BOX 136
-#define CSS_VAL__KHTML_DIAMOND 137
+#define CSS_VAL__TDEHTML_DIAMOND 137
#define CSS_VAL_DECIMAL 138
#define CSS_VAL_DECIMAL_LEADING_ZERO 139
-#define CSS_VAL__KHTML_ARABIC_INDIC 140
-#define CSS_VAL__KHTML_LAO 141
-#define CSS_VAL__KHTML_PERSIAN 142
-#define CSS_VAL__KHTML_URDU 143
-#define CSS_VAL__KHTML_THAI 144
-#define CSS_VAL__KHTML_TIBETAN 145
+#define CSS_VAL__TDEHTML_ARABIC_INDIC 140
+#define CSS_VAL__TDEHTML_LAO 141
+#define CSS_VAL__TDEHTML_PERSIAN 142
+#define CSS_VAL__TDEHTML_URDU 143
+#define CSS_VAL__TDEHTML_THAI 144
+#define CSS_VAL__TDEHTML_TIBETAN 145
#define CSS_VAL_LOWER_ROMAN 146
#define CSS_VAL_UPPER_ROMAN 147
#define CSS_VAL_HEBREW 148
#define CSS_VAL_ARMENIAN 149
#define CSS_VAL_GEORGIAN 150
#define CSS_VAL_CJK_IDEOGRAPHIC 151
-#define CSS_VAL__KHTML_JAPANESE_FORMAL 152
-#define CSS_VAL__KHTML_JAPANESE_INFORMAL 153
-#define CSS_VAL__KHTML_SIMP_CHINESE_FORMAL 154
-#define CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL 155
-#define CSS_VAL__KHTML_TRAD_CHINESE_FORMAL 156
-#define CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL 157
+#define CSS_VAL__TDEHTML_JAPANESE_FORMAL 152
+#define CSS_VAL__TDEHTML_JAPANESE_INFORMAL 153
+#define CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL 154
+#define CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL 155
+#define CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL 156
+#define CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL 157
#define CSS_VAL_LOWER_GREEK 158
-#define CSS_VAL__KHTML_UPPER_GREEK 159
+#define CSS_VAL__TDEHTML_UPPER_GREEK 159
#define CSS_VAL_LOWER_ALPHA 160
#define CSS_VAL_LOWER_LATIN 161
#define CSS_VAL_UPPER_ALPHA 162
@@ -176,8 +176,8 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_KATAKANA 165
#define CSS_VAL_HIRAGANA_IROHA 166
#define CSS_VAL_KATAKANA_IROHA 167
-#define CSS_VAL__KHTML_OPEN_QUOTE 168
-#define CSS_VAL__KHTML_CLOSE_QUOTE 169
+#define CSS_VAL__TDEHTML_OPEN_QUOTE 168
+#define CSS_VAL__TDEHTML_CLOSE_QUOTE 169
#define CSS_VAL_INLINE 170
#define CSS_VAL_BLOCK 171
#define CSS_VAL_LIST_ITEM 172
@@ -226,7 +226,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_PRE 215
#define CSS_VAL_PRE_WRAP 216
#define CSS_VAL_PRE_LINE 217
-#define CSS_VAL__KHTML_NOWRAP 218
+#define CSS_VAL__TDEHTML_NOWRAP 218
#define CSS_VAL_BREAK_WORD 219
#define CSS_VAL_ABOVE 220
#define CSS_VAL_ABSOLUTE 221
@@ -261,8 +261,8 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_THICK 250
#define CSS_VAL_THIN 251
#define CSS_VAL_UNDERLINE 252
-#define CSS_VAL__KHTML_NORMAL 253
-#define CSS_VAL__KHTML_AROUND_FLOATS 254
+#define CSS_VAL__TDEHTML_NORMAL 253
+#define CSS_VAL__TDEHTML_AROUND_FLOATS 254
#define CSS_VAL_BORDER_BOX 255
#define CSS_VAL_CONTENT_BOX 256
#define CSS_VAL_ENABLED 257
diff --git a/tdehtml/css/cssvalues.in b/tdehtml/css/cssvalues.in
index b85d49f17..30ed44475 100644
--- a/tdehtml/css/cssvalues.in
+++ b/tdehtml/css/cssvalues.in
@@ -350,16 +350,16 @@ thick
thin
underline
#
-# CSS_PROP__KHTML_FLOW_MODE
+# CSS_PROP__TDEHTML_FLOW_MODE
-tdehtml-normal
-tdehtml-around-floats
# CSS3 Values
-# CSS_PROP__KHTML_BOX_SIZING
+# CSS_PROP__TDEHTML_BOX_SIZING
border-box
content-box
-# CSS_PROP__KHTML_USER_INPUT
+# CSS_PROP__TDEHTML_USER_INPUT
enabled
disabled
#none
diff --git a/tdehtml/css/parser.cpp b/tdehtml/css/parser.cpp
index f88b7d002..3e8ee89fd 100644
--- a/tdehtml/css/parser.cpp
+++ b/tdehtml/css/parser.cpp
@@ -81,9 +81,9 @@
FONT_FACE_SYM = 273,
CHARSET_SYM = 274,
NAMESPACE_SYM = 275,
- KHTML_RULE_SYM = 276,
- KHTML_DECLS_SYM = 277,
- KHTML_VALUE_SYM = 278,
+ TDEHTML_RULE_SYM = 276,
+ TDEHTML_DECLS_SYM = 277,
+ TDEHTML_VALUE_SYM = 278,
IMPORTANT_SYM = 279,
QEMS = 280,
EMS = 281,
@@ -129,9 +129,9 @@
#define FONT_FACE_SYM 273
#define CHARSET_SYM 274
#define NAMESPACE_SYM 275
-#define KHTML_RULE_SYM 276
-#define KHTML_DECLS_SYM 277
-#define KHTML_VALUE_SYM 278
+#define TDEHTML_RULE_SYM 276
+#define TDEHTML_DECLS_SYM 277
+#define TDEHTML_VALUE_SYM 278
#define IMPORTANT_SYM 279
#define QEMS 280
#define EMS 281
@@ -589,7 +589,7 @@ static const char *const yytname[] =
"INCLUDES", "DASHMATCH", "BEGINSWITH", "ENDSWITH", "CONTAINS", "STRING",
"IDENT", "NTH", "HASH", "':'", "'.'", "'['", "'*'", "'|'", "IMPORT_SYM",
"PAGE_SYM", "MEDIA_SYM", "FONT_FACE_SYM", "CHARSET_SYM", "NAMESPACE_SYM",
- "KHTML_RULE_SYM", "KHTML_DECLS_SYM", "KHTML_VALUE_SYM", "IMPORTANT_SYM",
+ "TDEHTML_RULE_SYM", "TDEHTML_DECLS_SYM", "TDEHTML_VALUE_SYM", "IMPORTANT_SYM",
"QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", "INS", "PTS", "PCS", "DEGS",
"RADS", "GRADS", "MSECS", "SECS", "HERZ", "KHERZ", "DIMEN", "PERCENTAGE",
"FLOAT", "INTEGER", "URI", "FUNCTION", "NOTFUNCTION", "UNICODERANGE",
diff --git a/tdehtml/css/parser.h b/tdehtml/css/parser.h
index e3375db66..2920fd9de 100644
--- a/tdehtml/css/parser.h
+++ b/tdehtml/css/parser.h
@@ -48,9 +48,9 @@
FONT_FACE_SYM = 273,
CHARSET_SYM = 274,
NAMESPACE_SYM = 275,
- KHTML_RULE_SYM = 276,
- KHTML_DECLS_SYM = 277,
- KHTML_VALUE_SYM = 278,
+ TDEHTML_RULE_SYM = 276,
+ TDEHTML_DECLS_SYM = 277,
+ TDEHTML_VALUE_SYM = 278,
IMPORTANT_SYM = 279,
QEMS = 280,
EMS = 281,
@@ -96,9 +96,9 @@
#define FONT_FACE_SYM 273
#define CHARSET_SYM 274
#define NAMESPACE_SYM 275
-#define KHTML_RULE_SYM 276
-#define KHTML_DECLS_SYM 277
-#define KHTML_VALUE_SYM 278
+#define TDEHTML_RULE_SYM 276
+#define TDEHTML_DECLS_SYM 277
+#define TDEHTML_VALUE_SYM 278
#define IMPORTANT_SYM 279
#define QEMS 280
#define EMS 281
diff --git a/tdehtml/css/parser.y b/tdehtml/css/parser.y
index bb6f915f9..6d8b18e9a 100644
--- a/tdehtml/css/parser.y
+++ b/tdehtml/css/parser.y
@@ -164,9 +164,9 @@ static int cssyylex( YYSTYPE *yylval ) {
%token FONT_FACE_SYM
%token CHARSET_SYM
%token NAMESPACE_SYM
-%token KHTML_RULE_SYM
-%token KHTML_DECLS_SYM
-%token KHTML_VALUE_SYM
+%token TDEHTML_RULE_SYM
+%token TDEHTML_DECLS_SYM
+%token TDEHTML_VALUE_SYM
%token IMPORTANT_SYM
@@ -261,20 +261,20 @@ stylesheet:
;
tdehtml_rule:
- KHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
+ TDEHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
CSSParser *p = static_cast<CSSParser *>(parser);
p->rule = $4;
}
;
tdehtml_decls:
- KHTML_DECLS_SYM declaration_block {
+ TDEHTML_DECLS_SYM declaration_block {
/* can be empty */
}
;
tdehtml_value:
- KHTML_VALUE_SYM '{' maybe_space expr '}' {
+ TDEHTML_VALUE_SYM '{' maybe_space expr '}' {
CSSParser *p = static_cast<CSSParser *>(parser);
if ( $4 ) {
p->valueList = $4;
diff --git a/tdehtml/css/tokenizer.cpp b/tdehtml/css/tokenizer.cpp
index 493a98032..48fd174d1 100644
--- a/tdehtml/css/tokenizer.cpp
+++ b/tdehtml/css/tokenizer.cpp
@@ -756,17 +756,17 @@ YY_RULE_SETUP
case 20:
YY_RULE_SETUP
#line 53 "tokenizer.flex"
-{yyTok = KHTML_RULE_SYM; return yyTok; }
+{yyTok = TDEHTML_RULE_SYM; return yyTok; }
YY_BREAK
case 21:
YY_RULE_SETUP
#line 54 "tokenizer.flex"
-{yyTok = KHTML_DECLS_SYM; return yyTok; }
+{yyTok = TDEHTML_DECLS_SYM; return yyTok; }
YY_BREAK
case 22:
YY_RULE_SETUP
#line 55 "tokenizer.flex"
-{yyTok = KHTML_VALUE_SYM; return yyTok; }
+{yyTok = TDEHTML_VALUE_SYM; return yyTok; }
YY_BREAK
case 23:
YY_RULE_SETUP
diff --git a/tdehtml/css/tokenizer.flex b/tdehtml/css/tokenizer.flex
index 76fcadb7c..330d13042 100644
--- a/tdehtml/css/tokenizer.flex
+++ b/tdehtml/css/tokenizer.flex
@@ -50,9 +50,9 @@ nth (-?[0-9]*n[\+-][0-9]+)|(-?[0-9]*n)
"@font-face" {yyTok = FONT_FACE_SYM; return yyTok;}
"@charset" {yyTok = CHARSET_SYM; return yyTok;}
"@namespace" {yyTok = NAMESPACE_SYM; return yyTok; }
-"@-tdehtml-rule" {yyTok = KHTML_RULE_SYM; return yyTok; }
-"@-tdehtml-decls" {yyTok = KHTML_DECLS_SYM; return yyTok; }
-"@-tdehtml-value" {yyTok = KHTML_VALUE_SYM; return yyTok; }
+"@-tdehtml-rule" {yyTok = TDEHTML_RULE_SYM; return yyTok; }
+"@-tdehtml-decls" {yyTok = TDEHTML_DECLS_SYM; return yyTok; }
+"@-tdehtml-value" {yyTok = TDEHTML_VALUE_SYM; return yyTok; }
"!"{w}"important" {yyTok = IMPORTANT_SYM; return yyTok;}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 18:56:38 +0000