[kdelibs/frameworks] khtml: Avoid DOM->Q->DOM string conversion.

Git commit f6679dfb06714d2fa651566c1d49cad1440f31ec by Aaron Seigo, on behalf of Andrea Iacovitti.
Committed on 02/12/2011 at 00:36.
Pushed by aseigo into branch 'frameworks'.

Avoid DOM->Q->DOM string conversion.
Remove redundant check on m_image.
FIXED-IN: 4.7.4

M +1 -1 khtml/khtmlimage.cpp
M +1 -1 khtml/xml/dom_nodelistimpl.cpp

http://commits.kde.org/kdelibs/f6679dfb06714d2fa651566c1d49cad1440f31ec

diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp
index 7823f0e..5738d85 100644
--- a/khtml/khtmlimage.cpp
+++ b/khtml/khtmlimage.cpp
@@ -197,7 +197,7 @@ void KHTMLImage::notifyFinished( khtml::CachedObject *o )
if ( !m_mimeType.isEmpty() )
mimeType = KMimeType::mimeType(m_mimeType, KMimeType::ResolveAliases);

- if ( mimeType && m_image ) {
+ if ( mimeType ) {
if ( !m_image->suggestedTitle().isEmpty() ) {
caption = i18n( "%1 (%2 - %3x%4 Pixels)", m_image->suggestedTitle(), mimeType->comment(), m_image->pixmap_size().width(), m_image->pixmap_size().height() );
} else {
diff --git a/khtml/xml/dom_nodelistimpl.cpp b/khtml/xml/dom_nodelistimpl.cpp
index 2608b44..5c155da 100644
--- a/khtml/xml/dom_nodelistimpl.cpp
+++ b/khtml/xml/dom_nodelistimpl.cpp
@@ -306,7 +306,7 @@ bool NameNodeListImpl::nodeMatches( NodeImpl *testNode, bool& /*doRecurse*/ ) co
ClassNodeListImpl::ClassNodeListImpl(NodeImpl* rootNode, const DOMString& classNames)
: DynamicNodeListImpl(rootNode, UNCACHEABLE, DynamicNodeListImpl::Cache::makeClassName)
{
- m_classNames.parseClassAttribute(classNames.string(), m_refNode->document()->inCompatMode());
+ m_classNames.parseClassAttribute(classNames, m_refNode->document()->inCompatMode());
}

bool ClassNodeListImpl::nodeMatches(NodeImpl *testNode, bool& doRecurse) const