Commit af97ac07 authored by Dirk Mueller's avatar Dirk Mueller

don't use DOMString(int) constructor. eventually I'll make it explicit

to avoid confusion

svn path=/trunk/kdelibs/; revision=106239
parent 0a277bf0
......@@ -68,7 +68,7 @@ unsigned short CSSRule::type() const
DOMString CSSRule::cssText() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return impl->cssText();
}
......@@ -147,7 +147,7 @@ CSSCharsetRule::~CSSCharsetRule()
DOMString CSSCharsetRule::encoding() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((CSSCharsetRuleImpl*)impl)->encoding();
}
......@@ -252,7 +252,7 @@ CSSImportRule::~CSSImportRule()
DOMString CSSImportRule::href() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((CSSImportRuleImpl *)impl)->href();
}
......@@ -382,7 +382,7 @@ CSSPageRule::~CSSPageRule()
DOMString CSSPageRule::selectorText() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((CSSPageRuleImpl*)impl)->selectorText();
}
......@@ -445,7 +445,7 @@ CSSStyleRule::~CSSStyleRule()
DOMString CSSStyleRule::selectorText() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((CSSStyleRuleImpl*)impl)->selectorText();
}
......
......@@ -70,7 +70,7 @@ StyleSheet::~StyleSheet()
DOMString StyleSheet::type() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((StyleSheetImpl *)impl)->type();
}
......@@ -100,13 +100,13 @@ StyleSheet StyleSheet::parentStyleSheet() const
DOMString StyleSheet::href() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((StyleSheetImpl *)impl)->href();
}
DOMString StyleSheet::title() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((StyleSheetImpl *)impl)->title();
}
......@@ -294,13 +294,13 @@ MediaList::~MediaList()
DOM::DOMString MediaList::mediaText()
{
if(!impl) return 0;
if(!impl) return DOMString();
return static_cast<MediaListImpl *>(impl)->mediaText();
}
DOM::DOMString MediaList::mediaText() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return static_cast<MediaListImpl *>(impl)->mediaText();
}
......@@ -318,7 +318,7 @@ unsigned long MediaList::length()
DOM::DOMString MediaList::item(unsigned long index)
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((MediaListImpl *)impl)->item( index );
}
......
......@@ -59,7 +59,7 @@ CSSStyleDeclaration::~CSSStyleDeclaration()
DOMString CSSStyleDeclaration::cssText() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return static_cast<CSSStyleDeclarationImpl *>(impl)->cssText();
}
......@@ -71,7 +71,7 @@ void CSSStyleDeclaration::setCssText( const DOMString &value )
DOMString CSSStyleDeclaration::getPropertyValue( const DOMString &propertyName )
{
if(!impl) return 0;
if(!impl) return DOMString();
return static_cast<CSSStyleDeclarationImpl *>(impl)->getPropertyValue( propertyName );
}
......@@ -83,14 +83,14 @@ CSSValue CSSStyleDeclaration::getPropertyCSSValue( const DOMString &propertyName
DOMString CSSStyleDeclaration::removeProperty( const DOMString &propertyName )
{
if(!impl) return 0;
if(!impl) return DOMString();
return static_cast<CSSStyleDeclarationImpl *>(impl)->removeProperty( propertyName );
return 0;
return DOMString();
}
DOMString CSSStyleDeclaration::getPropertyPriority( const DOMString &propertyName )
{
if(!impl) return 0;
if(!impl) return DOMString();
return impl->getPropertyPriority(propertyName);
}
......@@ -108,7 +108,7 @@ unsigned long CSSStyleDeclaration::length() const
DOMString CSSStyleDeclaration::item( unsigned long index )
{
if(!impl) return 0;
if(!impl) return DOMString();
return static_cast<CSSStyleDeclarationImpl *>(impl)->item( index );
}
......@@ -162,7 +162,7 @@ CSSValue::~CSSValue()
DOMString CSSValue::cssText() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((CSSValueImpl *)impl)->cssText();
}
......@@ -349,7 +349,7 @@ void CSSPrimitiveValue::setStringValue( unsigned short stringType, const DOMStri
DOMString CSSPrimitiveValue::getStringValue( )
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((CSSPrimitiveValueImpl *)impl)->getStringValue( );
}
......@@ -405,19 +405,19 @@ Counter::~Counter()
DOMString Counter::identifier() const
{
if (!impl) return 0;
if (!impl) return DOMString();
return impl->identifier();
}
DOMString Counter::listStyle() const
{
if (!impl) return 0;
if (!impl) return DOMString();
return impl->listStyle();
}
DOMString Counter::separator() const
{
if (!impl) return 0;
if (!impl) return DOMString();
return impl->separator();
}
......
......@@ -288,7 +288,7 @@ NodeIterator Document::createNodeIterator(Node root, unsigned long whatToShow,
{
if (!impl)
throw DOMException(DOMException::INVALID_STATE_ERR);
int exceptioncode = 0;
NodeIteratorImpl *r = static_cast<DocumentImpl*>(impl)->createNodeIterator(root.handle(),
whatToShow,filter,entityReferenceExpansion,exceptioncode);
......@@ -421,7 +421,7 @@ DOMString DocumentType::name() const
{
if (impl)
return static_cast<DocumentTypeImpl*>(impl)->name();
return 0;
return DOMString();
}
NamedNodeMap DocumentType::entities() const
......
......@@ -66,7 +66,7 @@ Attr::~Attr()
DOMString Attr::name() const
{
if (impl) return ((AttrImpl *)impl)->name();
return 0;
return DOMString();
}
bool Attr::specified() const
......@@ -78,7 +78,7 @@ bool Attr::specified() const
DOMString Attr::value() const
{
if (impl) return ((AttrImpl *)impl)->value();
return 0;
return DOMString();
}
void Attr::setValue( const DOMString &newValue )
......@@ -124,13 +124,13 @@ Element::~Element()
DOMString Element::tagName() const
{
if (impl) return ((ElementImpl *)impl)->tagName();
return 0;
return DOMString();
}
DOMString Element::getAttribute( const DOMString &name )
{
if (impl) return ((ElementImpl *)impl)->getAttribute(name);
return 0;
return DOMString();
}
void Element::setAttribute( const DOMString &name, const DOMString &value )
......
......@@ -72,7 +72,7 @@ Node NamedNodeMap::getNamedItem( const DOMString &name ) const
{
if (!impl)
return 0; // ### enable throw DOMException(DOMException::NOT_FOUND_ERR);
int exceptioncode = 0;
NodeImpl *r = impl->getNamedItem(name,exceptioncode);
if (exceptioncode)
......@@ -84,7 +84,7 @@ Node NamedNodeMap::setNamedItem( const Node &arg )
{
if (!impl)
return 0; // ### enable throw throw DOMException(DOMException::NOT_FOUND_ERR);
int exceptioncode = 0;
Node r = impl->setNamedItem(arg,exceptioncode);
if (exceptioncode)
......@@ -96,7 +96,7 @@ Node NamedNodeMap::removeNamedItem( const DOMString &name )
{
if (!impl)
return 0; // ### enable throw throw DOMException(DOMException::NOT_FOUND_ERR);
int exceptioncode = 0;
Node r = impl->removeNamedItem(name,exceptioncode);
if (exceptioncode)
......@@ -108,7 +108,7 @@ Node NamedNodeMap::item( unsigned long index ) const
{
if (!impl)
return 0; // ### enable throw throw DOMException(DOMException::NOT_FOUND_ERR);
int exceptioncode = 0;
NodeImpl *r = impl->item(index,exceptioncode);
if (exceptioncode)
......@@ -120,7 +120,7 @@ unsigned long NamedNodeMap::length() const
{
if (!impl)
return 0; // ### enable throw throw DOMException(DOMException::NOT_FOUND_ERR);
int exceptioncode = 0;
unsigned long r = impl->length(exceptioncode);
if (exceptioncode)
......@@ -190,13 +190,13 @@ Node::~Node()
DOMString Node::nodeName() const
{
if(impl) return impl->nodeName();
return 0;
return DOMString();
}
DOMString Node::nodeValue() const
{
if(impl) return impl->nodeValue();
return 0;
return DOMString();
}
void Node::setNodeValue( const DOMString &_str )
......@@ -383,7 +383,7 @@ Node Node::cloneNode( bool deep )
{
if (!impl)
return 0; // ### enable throw throw DOMException(DOMException::NOT_FOUND_ERR);
int exceptioncode = 0;
NodeImpl *r = impl->cloneNode( deep, exceptioncode );
if (exceptioncode)
......@@ -403,7 +403,7 @@ void Node::addEventListener(const DOMString &type,
if (exceptioncode)
throw DOMException(exceptioncode);
}
void Node::removeEventListener(const DOMString &type,
EventListener *listener,
bool useCapture)
......
......@@ -173,7 +173,7 @@ void DOMString::remove(unsigned int pos, int len)
DOMString DOMString::split(unsigned int pos)
{
if(!impl) return 0;
if(!impl) return DOMString();
return impl->split(pos);
}
......@@ -211,7 +211,7 @@ int DOMString::toInt() const
DOMString DOMString::copy() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return impl->copy();
}
......
......@@ -45,7 +45,7 @@ class DOMString
public:
/** default constructor. Gives an empty DOMString */
DOMString();
/* constructs an empty DOMString. Like this assignment to 0 works */
/* constructs a null DOMString. Like this assignment to 0 works */
DOMString(int);
DOMString(const QChar *str, uint len);
......
......@@ -62,7 +62,7 @@ CharacterData::~CharacterData()
DOMString CharacterData::data() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((CharacterDataImpl *)impl)->data();
}
......@@ -120,7 +120,7 @@ void CharacterData::replaceData( const unsigned long offset, const unsigned long
if ( impl )
((CharacterDataImpl *)impl)->replaceData(offset, count, arg, exceptioncode);
if ( exceptioncode )
throw DOMException( exceptioncode );
throw DOMException( exceptioncode );
}
CharacterData::CharacterData(CharacterDataImpl *i) : Node(i)
......
......@@ -95,19 +95,19 @@ Entity::~Entity()
DOMString Entity::publicId() const
{
if (impl) return ((EntityImpl*)impl)->publicId();
return 0;
return DOMString();
}
DOMString Entity::systemId() const
{
if (impl) return ((EntityImpl*)impl)->systemId();
return 0;
return DOMString();
}
DOMString Entity::notationName() const
{
if (impl) return ((EntityImpl*)impl)->notationName();
return 0;
return DOMString();
}
Entity::Entity(EntityImpl *i) : Node(i)
......@@ -183,13 +183,13 @@ Notation::~Notation()
DOMString Notation::publicId() const
{
if (impl) return ((EntityImpl*)impl)->publicId();
return 0;
return DOMString();
}
DOMString Notation::systemId() const
{
if (impl) return ((EntityImpl*)impl)->systemId();
return 0;
return DOMString();
}
Notation::Notation(NotationImpl *i) : Node(i)
......@@ -232,13 +232,13 @@ ProcessingInstruction::~ProcessingInstruction()
DOMString ProcessingInstruction::target() const
{
if (impl) return ((ProcessingInstructionImpl*)impl)->target();
return 0;
return DOMString();
}
DOMString ProcessingInstruction::data() const
{
if (impl) return ((ProcessingInstructionImpl*)impl)->data();
return 0;
return DOMString();
}
void ProcessingInstruction::setData( const DOMString &_data )
......
......@@ -66,7 +66,7 @@ HTMLBodyElement::~HTMLBodyElement()
DOMString HTMLBodyElement::aLink() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_ALINK);
}
......@@ -77,7 +77,7 @@ void HTMLBodyElement::setALink( const DOMString &value )
DOMString HTMLBodyElement::background() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_BACKGROUND);
}
......@@ -88,7 +88,7 @@ void HTMLBodyElement::setBackground( const DOMString &value )
DOMString HTMLBodyElement::bgColor() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_BGCOLOR);
}
......@@ -99,7 +99,7 @@ void HTMLBodyElement::setBgColor( const DOMString &value )
DOMString HTMLBodyElement::link() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_LINK);
}
......@@ -110,7 +110,7 @@ void HTMLBodyElement::setLink( const DOMString &value )
DOMString HTMLBodyElement::text() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_TEXT);
}
......@@ -121,7 +121,7 @@ void HTMLBodyElement::setText( const DOMString &value )
DOMString HTMLBodyElement::vLink() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_VLINK);
}
......@@ -167,7 +167,7 @@ HTMLFrameElement::~HTMLFrameElement()
DOMString HTMLFrameElement::frameBorder() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_FRAMEBORDER);
}
......@@ -178,7 +178,7 @@ void HTMLFrameElement::setFrameBorder( const DOMString &value )
DOMString HTMLFrameElement::longDesc() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_LONGDESC);
}
......@@ -189,7 +189,7 @@ void HTMLFrameElement::setLongDesc( const DOMString &value )
DOMString HTMLFrameElement::marginHeight() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_MARGINHEIGHT);
}
......@@ -200,7 +200,7 @@ void HTMLFrameElement::setMarginHeight( const DOMString &value )
DOMString HTMLFrameElement::marginWidth() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_MARGINWIDTH);
}
......@@ -211,7 +211,7 @@ void HTMLFrameElement::setMarginWidth( const DOMString &value )
DOMString HTMLFrameElement::name() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_NAME);
}
......@@ -239,7 +239,7 @@ void HTMLFrameElement::setNoResize( bool _noResize )
DOMString HTMLFrameElement::scrolling() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_SCROLLING);
}
......@@ -250,7 +250,7 @@ void HTMLFrameElement::setScrolling( const DOMString &value )
DOMString HTMLFrameElement::src() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_SRC);
}
......@@ -296,7 +296,7 @@ HTMLFrameSetElement::~HTMLFrameSetElement()
DOMString HTMLFrameSetElement::cols() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_COLS);
}
......@@ -307,7 +307,7 @@ void HTMLFrameSetElement::setCols( const DOMString &value )
DOMString HTMLFrameSetElement::rows() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_ROWS);
}
......@@ -353,7 +353,7 @@ HTMLHeadElement::~HTMLHeadElement()
DOMString HTMLHeadElement::profile() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_PROFILE);
}
......@@ -399,7 +399,7 @@ HTMLHtmlElement::~HTMLHtmlElement()
DOMString HTMLHtmlElement::version() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_VERSION);
}
......
......@@ -65,7 +65,7 @@ HTMLBlockquoteElement::~HTMLBlockquoteElement()
DOMString HTMLBlockquoteElement::cite() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_CITE);
}
......@@ -111,7 +111,7 @@ HTMLDivElement::~HTMLDivElement()
DOMString HTMLDivElement::align() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_ALIGN);
}
......@@ -157,7 +157,7 @@ HTMLHRElement::~HTMLHRElement()
DOMString HTMLHRElement::align() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_ALIGN);
}
......@@ -185,7 +185,7 @@ void HTMLHRElement::setNoShade( bool _noShade )
DOMString HTMLHRElement::size() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_SIZE);
}
......@@ -196,7 +196,7 @@ void HTMLHRElement::setSize( const DOMString &value )
DOMString HTMLHRElement::width() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_WIDTH);
}
......@@ -247,7 +247,7 @@ HTMLHeadingElement::~HTMLHeadingElement()
DOMString HTMLHeadingElement::align() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_ALIGN);
}
......@@ -293,7 +293,7 @@ HTMLParagraphElement::~HTMLParagraphElement()
DOMString HTMLParagraphElement::align() const
{
if(!impl) return 0;
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_ALIGN);
}
......
......@@ -93,13 +93,13 @@ HTMLDocument::~HTMLDocument()
DOMString HTMLDocument::title() const
{
if(!impl) return 0;
if(!impl) return DOMString();
NodeImpl *e = static_cast<HTMLDocumentImpl *>(impl)->findElement(ID_TITLE);
if(!e) return 0;
if(!e) return DOMString();
NodeImpl *t = e->firstChild();
if(!t) return 0;
if(!t) return DOMString();
// ### join all text nodes within <TITLE>
return static_cast<TextImpl *>(t)->data();
......@@ -112,19 +112,19 @@ void HTMLDocument::setTitle( const DOMString &/*value*/ )