diff options
| -rw-r--r-- | khtml/ecma/kjs_dom.cpp | 18 | ||||
| -rw-r--r-- | khtml/khtml_part.cpp | 24 | ||||
| -rw-r--r-- | khtml/xml/dom_elementimpl.h | 6 |
3 files changed, 30 insertions, 18 deletions
diff --git a/khtml/ecma/kjs_dom.cpp b/khtml/ecma/kjs_dom.cpp index cc2f3c78a..fc7c97a26 100644 --- a/khtml/ecma/kjs_dom.cpp +++ b/khtml/ecma/kjs_dom.cpp @@ -609,17 +609,23 @@ Value DOMNodeProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &ar DOMString where = args[0].toString(exec).string(); - if (where == "beforeBegin" || where == "BeforeBegin") + if (where == "beforeBegin" || where == "BeforeBegin") { node.parentNode().insertBefore(docFrag, node); - else if (where == "afterBegin" || where == "AfterBegin") + } + else if (where == "afterBegin" || where == "AfterBegin") { node.insertBefore(docFrag, node.firstChild()); - else if (where == "beforeEnd" || where == "BeforeEnd") + } + else if (where == "beforeEnd" || where == "BeforeEnd") { return getDOMNode(exec, node.appendChild(docFrag)); - else if (where == "afterEnd" || where == "AfterEnd") - if (!node.nextSibling().isNull()) + } + else if (where == "afterEnd" || where == "AfterEnd") { + if (!node.nextSibling().isNull()) { node.parentNode().insertBefore(docFrag, node.nextSibling()); - else + } + else { node.parentNode().appendChild(docFrag); + } + } return Undefined(); } diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index 2fecf6c78..4f0a8c232 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -1429,8 +1429,10 @@ void KHTMLPart::clear() d->m_decoder = 0; // We don't want to change between parts if we are going to delete all of them anyway - disconnect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ), + if (partManager()) { + disconnect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ), this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); + } if (d->m_frames.count()) { @@ -1462,8 +1464,10 @@ void KHTMLPart::clear() } // Listen to part changes again - connect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ), + if (partManager()) { + connect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ), this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); + } d->m_delayRedirect = 0; d->m_redirectURL = TQString(); @@ -5593,14 +5597,16 @@ void KHTMLPart::restoreState( TQDataStream &stream ) if ( (*childFrame)->m_part ) { - if ( (*childFrame)->m_extension ) - if ( (*childFrame)->m_extension && !(*fBufferIt).isEmpty() ) - { - TQDataStream frameStream( *fBufferIt, IO_ReadOnly ); - (*childFrame)->m_extension->restoreState( frameStream ); + if ( (*childFrame)->m_extension ) { + if ( (*childFrame)->m_extension && !(*fBufferIt).isEmpty() ) + { + TQDataStream frameStream( *fBufferIt, IO_ReadOnly ); + (*childFrame)->m_extension->restoreState( frameStream ); + } + else { + (*childFrame)->m_part->openURL( *fURLIt ); + } } - else - (*childFrame)->m_part->openURL( *fURLIt ); } } diff --git a/khtml/xml/dom_elementimpl.h b/khtml/xml/dom_elementimpl.h index ee1be3e4a..81ce4c96a 100644 --- a/khtml/xml/dom_elementimpl.h +++ b/khtml/xml/dom_elementimpl.h @@ -357,11 +357,11 @@ inline bool checkQualifiedName(const DOMString &qualifiedName, const DOMString & } } - if (!qualifiedName.isNull() && Element::khtmlMalformedQualifiedName(qualifiedName) || + if (((!qualifiedName.isNull()) && Element::khtmlMalformedQualifiedName(qualifiedName)) || (colonpos >= 0 && namespaceURI.isNull()) || (qualifiedName.isNull() && !namespaceURI.isNull()) || - (colonpos == 3 && qualifiedName[0] == 'x' && qualifiedName[1] == 'm' && qualifiedName[2] == 'l' && - namespaceURI != "http://www.w3.org/XML/1998/namespace")) { + ((colonpos == 3) && (qualifiedName[0] == 'x') && (qualifiedName[1] == 'm') && (qualifiedName[2] == 'l') && + (namespaceURI != "http://www.w3.org/XML/1998/namespace"))) { if (pExceptioncode) *pExceptioncode = DOMException::NAMESPACE_ERR; return false; |