summaryrefslogtreecommitdiffstats
path: root/khtml/css
diff options
context:
space:
mode:
Diffstat (limited to 'khtml/css')
-rw-r--r--khtml/css/css_base.h2
-rw-r--r--khtml/css/css_renderstyledeclarationimpl.cpp2
-rw-r--r--khtml/css/css_ruleimpl.h2
-rw-r--r--khtml/css/css_valueimpl.cpp6
-rw-r--r--khtml/css/css_valueimpl.h2
-rw-r--r--khtml/css/csshelper.cpp2
-rw-r--r--khtml/css/cssparser.cpp10
-rw-r--r--khtml/css/cssproperties.c4
-rw-r--r--khtml/css/cssstyleselector.cpp44
-rw-r--r--khtml/css/html4.css12
10 files changed, 43 insertions, 43 deletions
diff --git a/khtml/css/css_base.h b/khtml/css/css_base.h
index 9a8774107..b38024bee 100644
--- a/khtml/css/css_base.h
+++ b/khtml/css/css_base.h
@@ -256,7 +256,7 @@ namespace DOM {
virtual ~StyleListImpl();
unsigned long length() const { return m_lstChildren->count(); }
- StyleBaseImpl *item(unsigned long num) const { return m_lstChildren->at(num); }
+ StyleBaseImpl *item(unsigned long num) const { return m_lstChildren->tqat(num); }
void append(StyleBaseImpl *item) { m_lstChildren->append(item); }
diff --git a/khtml/css/css_renderstyledeclarationimpl.cpp b/khtml/css/css_renderstyledeclarationimpl.cpp
index daf607a9e..eef98f41e 100644
--- a/khtml/css/css_renderstyledeclarationimpl.cpp
+++ b/khtml/css/css_renderstyledeclarationimpl.cpp
@@ -930,7 +930,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
case CSS_PROP_TOP:
return getPositionOffsetValue(renderer, CSS_PROP_TOP);
case CSS_PROP_UNICODE_BIDI:
- switch (style->unicodeBidi()) {
+ switch (style->tqunicodeBidi()) {
case UBNormal:
return new CSSPrimitiveValueImpl(CSS_VAL_NORMAL);
case Embed:
diff --git a/khtml/css/css_ruleimpl.h b/khtml/css/css_ruleimpl.h
index 2753fcf83..d9928994d 100644
--- a/khtml/css/css_ruleimpl.h
+++ b/khtml/css/css_ruleimpl.h
@@ -137,7 +137,7 @@ public:
~CSSRuleListImpl();
unsigned long length() const { return m_lstCSSRules.count(); }
- CSSRuleImpl *item ( unsigned long index ) { return m_lstCSSRules.at( index ); }
+ CSSRuleImpl *item ( unsigned long index ) { return m_lstCSSRules.tqat( index ); }
/* not part of the DOM */
diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp
index a6150c78b..3fa38efe9 100644
--- a/khtml/css/css_valueimpl.cpp
+++ b/khtml/css/css_valueimpl.cpp
@@ -281,7 +281,7 @@ void CSSStyleDeclarationImpl::removeCSSHints()
return;
for (int i = (int)m_lstValues->count()-1; i >= 0; i--) {
- if (!m_lstValues->at(i)->nonCSSHint)
+ if (!m_lstValues->tqat(i)->nonCSSHint)
m_lstValues->remove(i);
}
}
@@ -358,8 +358,8 @@ unsigned long CSSStyleDeclarationImpl::length() const
DOMString CSSStyleDeclarationImpl::item( unsigned long index ) const
{
- if(m_lstValues && index < m_lstValues->count() && m_lstValues->at(index))
- return getPropertyName(m_lstValues->at(index)->m_id);
+ if(m_lstValues && index < m_lstValues->count() && m_lstValues->tqat(index))
+ return getPropertyName(m_lstValues->tqat(index)->m_id);
return DOMString();
}
diff --git a/khtml/css/css_valueimpl.h b/khtml/css/css_valueimpl.h
index 3566c00cb..668c53d93 100644
--- a/khtml/css/css_valueimpl.h
+++ b/khtml/css/css_valueimpl.h
@@ -136,7 +136,7 @@ public:
virtual ~CSSValueListImpl();
unsigned long length() const { return m_values.count(); }
- CSSValueImpl *item ( unsigned long index ) { return m_values.at(index); }
+ CSSValueImpl *item ( unsigned long index ) { return m_values.tqat(index); }
virtual bool isValueList() const { return true; }
diff --git a/khtml/css/csshelper.cpp b/khtml/css/csshelper.cpp
index b388d2215..96e184f2f 100644
--- a/khtml/css/csshelper.cpp
+++ b/khtml/css/csshelper.cpp
@@ -78,7 +78,7 @@ DOMString khtml::parseURL(const DOMString &url)
int nl = 0;
for(int k = o; k < o+l; k++)
- if(i->s[k].unicode() > '\r')
+ if(i->s[k].tqunicode() > '\r')
j->s[nl++] = i->s[k];
j->l = nl;
diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp
index 6ca1a069b..474067cf0 100644
--- a/khtml/css/cssparser.cpp
+++ b/khtml/css/cssparser.cpp
@@ -166,7 +166,7 @@ void CSSParser::parseSheet( CSSStyleSheetImpl *sheet, const DOMString &string )
int length = string.length() + 3;
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
- memcpy( data, string.unicode(), string.length()*sizeof( unsigned short) );
+ memcpy( data, string.tqunicode(), string.length()*sizeof( unsigned short) );
#ifdef CSS_DEBUG
kdDebug( 6080 ) << ">>>>>>> start parsing style sheet" << endl;
@@ -190,7 +190,7 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
for ( unsigned int i = 0; i < strlen(khtml_rule); i++ )
data[i] = khtml_rule[i];
- memcpy( data + strlen( khtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) );
+ memcpy( data + strlen( khtml_rule ), string.tqunicode(), string.length()*sizeof( unsigned short) );
// qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );
data[length-4] = '}';
@@ -218,7 +218,7 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id,
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
for ( unsigned int i = 0; i < strlen(khtml_value); i++ )
data[i] = khtml_value[i];
- memcpy( data + strlen( khtml_value ), string.unicode(), string.length()*sizeof( unsigned short) );
+ memcpy( data + strlen( khtml_value ), string.tqunicode(), string.length()*sizeof( unsigned short) );
data[length-4] = '}';
// qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );
@@ -260,7 +260,7 @@ bool CSSParser::parseDeclaration( DOM::CSSStyleDeclarationImpl *declaration, con
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
for ( unsigned int i = 0; i < strlen(khtml_decls); i++ )
data[i] = khtml_decls[i];
- memcpy( data + strlen( khtml_decls ), string.unicode(), string.length()*sizeof( unsigned short) );
+ memcpy( data + strlen( khtml_decls ), string.tqunicode(), string.length()*sizeof( unsigned short) );
data[length-4] = '}';
nonCSSHint = _nonCSSHint;
@@ -522,7 +522,7 @@ bool CSSParser::parseValue( int propId, bool important )
valid_primitive = true;
break;
- case CSS_PROP_CLIP: // <shape> | auto | inherit
+ case CSS_PROP_CLIP: // <tqshape> | auto | inherit
if ( id == CSS_VAL_AUTO )
valid_primitive = true;
else if ( value->unit == Value::Function )
diff --git a/khtml/css/cssproperties.c b/khtml/css/cssproperties.c
index c86f2d326..894ab787f 100644
--- a/khtml/css/cssproperties.c
+++ b/khtml/css/cssproperties.c
@@ -281,7 +281,7 @@ findProp (register const char *str, register unsigned int len)
#line 102 "cssproperties.gperf"
{"text-align", CSS_PROP_TEXT_ALIGN},
#line 109 "cssproperties.gperf"
- {"unicode-bidi", CSS_PROP_UNICODE_BIDI},
+ {"tqunicode-bidi", CSS_PROP_UNICODE_BIDI},
#line 82 "cssproperties.gperf"
{"outline-color", CSS_PROP_OUTLINE_COLOR},
#line 60 "cssproperties.gperf"
@@ -632,7 +632,7 @@ static const char * const propertyList[] = {
"text-shadow",
"text-transform",
"top",
-"unicode-bidi",
+"tqunicode-bidi",
"vertical-align",
"visibility",
"white-space",
diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp
index 35a5ff704..32391bb7f 100644
--- a/khtml/css/cssstyleselector.cpp
+++ b/khtml/css/cssstyleselector.cpp
@@ -327,7 +327,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
if ( readbytes >= 0 )
file[readbytes] = '\0';
- TQString style = TQString::fromLatin1( file.data() );
+ TQString style = TQString::tqfromLatin1( file.data() );
if(s)
style += s->settingsToCSS();
DOMString str(style);
@@ -352,7 +352,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
if ( readbytes >= 0 )
file[readbytes] = '\0';
- TQString style = TQString::fromLatin1( file.data() );
+ TQString style = TQString::tqfromLatin1( file.data() );
DOMString str(style);
s_quirksSheet = new DOM::CSSStyleSheetImpl(doc);
@@ -742,7 +742,7 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e
style->adjustBackgroundLayers();
// Only use slow repaints if we actually have a background image.
- // FIXME: We only need to invalidate the fixed regions when scrolling. It's total overkill to
+ // FIXME: We only need to tqinvalidate the fixed regions when scrolling. It's total overkill to
// prevent the entire view from blitting on a scroll.
if (style->hasFixedBackgroundImage() && view)
view->useSlowRepaints();
@@ -786,7 +786,7 @@ unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e,
if (i == firstLen)
values = addValues;
- CSSProperty *prop = values->at(i >= firstLen ? i - firstLen : i);
+ CSSProperty *prop = values->tqat(i >= firstLen ? i - firstLen : i);
Source source = Inline;
if( prop->m_important ) source = InlineImportant;
@@ -871,7 +871,7 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
if( attr.isNull() ) {
return PseudoNone;
}
- TQConstString cu(attr.unicode(), attr.length());
+ TQConstString cu(attr.tqunicode(), attr.length());
TQString u = cu.string();
if ( !u.contains("://") ) {
if ( u[0] == '/' )
@@ -1165,8 +1165,8 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
// else the value is longer and can be a list
if ( sel->match == CSSSelector::Class && !e->hasClassList() ) return false;
- TQChar* sel_uc = sel->value.unicode();
- TQChar* val_uc = value->unicode();
+ TQChar* sel_uc = sel->value.tqunicode();
+ TQChar* val_uc = value->tqunicode();
TQConstString sel_str(sel_uc, sel_len);
TQConstString val_str(val_uc, val_len);
@@ -1187,29 +1187,29 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
case CSSSelector::Contain:
{
//kdDebug( 6080 ) << "checking for contains match" << endl;
- TQConstString val_str(value->unicode(), value->length());
- TQConstString sel_str(sel->value.unicode(), sel->value.length());
+ TQConstString val_str(value->tqunicode(), value->length());
+ TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
return val_str.string().contains(sel_str.string(), caseSensitive);
}
case CSSSelector::Begin:
{
//kdDebug( 6080 ) << "checking for beginswith match" << endl;
- TQConstString val_str(value->unicode(), value->length());
- TQConstString sel_str(sel->value.unicode(), sel->value.length());
- return val_str.string().startsWith(sel_str.string(), caseSensitive);
+ TQConstString val_str(value->tqunicode(), value->length());
+ TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
+ return val_str.string().tqstartsWith(sel_str.string(), caseSensitive);
}
case CSSSelector::End:
{
//kdDebug( 6080 ) << "checking for endswith match" << endl;
- TQConstString val_str(value->unicode(), value->length());
- TQConstString sel_str(sel->value.unicode(), sel->value.length());
- return val_str.string().endsWith(sel_str.string(), caseSensitive);
+ TQConstString val_str(value->tqunicode(), value->length());
+ TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
+ return val_str.string().tqendsWith(sel_str.string(), caseSensitive);
}
case CSSSelector::Hyphen:
{
//kdDebug( 6080 ) << "checking for hyphen match" << endl;
- TQConstString val_str(value->unicode(), value->length());
- TQConstString sel_str(sel->value.unicode(), sel->value.length());
+ TQConstString val_str(value->tqunicode(), value->length());
+ TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
const TQString& str = val_str.string();
const TQString& selStr = sel_str.string();
if(str.length() < selStr.length()) return false;
@@ -1782,7 +1782,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet,
TQPtrList<CSSSelector> *s = r->selector();
for(int j = 0; j < (int)s->count(); j++)
{
- CSSOrderedRule *rule = new CSSOrderedRule(r, s->at(j), count());
+ CSSOrderedRule *rule = new CSSOrderedRule(r, s->tqat(j), count());
TQPtrList<CSSOrderedRule>::append(rule);
//kdDebug( 6080 ) << "appending StyleRule!" << endl;
}
@@ -1829,7 +1829,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet,
for( int j = 0; j < ( int ) s->count(); j++ )
{
CSSOrderedRule *orderedRule = new CSSOrderedRule(
- styleRule, s->at( j ), count() );
+ styleRule, s->tqat( j ), count() );
TQPtrList<CSSOrderedRule>::append( orderedRule );
}
}
@@ -1891,7 +1891,7 @@ void CSSOrderedPropertyList::append(DOM::CSSStyleDeclarationImpl *decl, uint sel
int len = values->count();
for(int i = 0; i < len; i++)
{
- CSSProperty *prop = values->at(i);
+ CSSProperty *prop = values->tqat(i);
Source source = regular;
if( prop->m_important ) source = important;
@@ -2079,7 +2079,7 @@ static TQColor colorForCSSValue( int css_value )
KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
bckgrConfig.setGroup("Desktop0");
// Desktop background.
- return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background());
+ return bckgrConfig.readColorEntry("Color1", &tqApp->tqpalette().disabled().background());
}
return TQColor();
}
@@ -2597,7 +2597,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
}
case CSS_PROP_UNICODE_BIDI: {
- HANDLE_INHERIT_AND_INITIAL(unicodeBidi, UnicodeBidi)
+ HANDLE_INHERIT_AND_INITIAL(tqunicodeBidi, UnicodeBidi)
if(!primitiveValue) break;
switch (primitiveValue->getIdent()) {
case CSS_VAL_NORMAL:
diff --git a/khtml/css/html4.css b/khtml/css/html4.css
index c3fd1a347..575945464 100644
--- a/khtml/css/html4.css
+++ b/khtml/css/html4.css
@@ -486,27 +486,27 @@ a:visited:active { color: red; outline: 1px dotted invert; }
bdo[dir="ltr"] {
direction: ltr;
- unicode-bidi: bidi-override;
+ tqunicode-bidi: bidi-override;
}
bdo[dir="rtl"] {
direction: rtl;
- unicode-bidi: bidi-override;
+ tqunicode-bidi: bidi-override;
}
/* ### this selector seems to be still broken ...
- *[dir="ltr"] { direction: ltr; unicode-bidi: embed }
- *[dir="rtl"] { direction: rtl; unicode-bidi: embed }
+ *[dir="ltr"] { direction: ltr; tqunicode-bidi: embed }
+ *[dir="rtl"] { direction: rtl; tqunicode-bidi: embed }
*/
/* elements that are block-level in html4 */
-/* ### don't support unicode-bidi at the moment
+/* ### don't support tqunicode-bidi at the moment
address, blockquote, body, dd, div, dl, dt, fieldset,
form, frame, frameset, h1, h2, h3, h4, h5, h6, iframe,
noscript, noframes, object, ol, p, ul, applet, center,
dir, hr, menu, pre, li, table, tr, thead, tbody, tfoot,
col, colgroup, td, th, caption
- { unicode-bidi: embed }
+ { tqunicode-bidi: embed }
*/
/* end bidi settings */
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 14:37:33 +0000