Unneeded DOMString->QString conversion and check.

khtml/html/html_formimpl.cpp

@@ -2518,10 +2518,7 @@ bool HTMLSelectElementImpl::encoding(const QTextCodec* codec, khtml::encodingLis
         (items[0]->id() == ID_OPTION && !items[0]->disabled()) ) {
         HTMLOptionElementImpl* const option = static_cast<HTMLOptionElementImpl*>(items[0]);
         encoded_values += enc_name;
-        if (option->value().isNull())
-            encoded_values += fixUpfromUnicode(codec, option->text().string());
-        else
-            encoded_values += fixUpfromUnicode(codec, option->value().string());
+        encoded_values += fixUpfromUnicode(codec, option->value().string());
         successful = true;
     }
 
@@ -2801,7 +2798,7 @@ DOMString HTMLOptionElementImpl::value() const
     if ( !m_value.isNull() )
         return m_value;
     // Use the text if the value wasn't set.
-    return text().string();
+    return text();
 }
 
 void HTMLOptionElementImpl::setValue(DOMStringImpl* value)

khtml/rendering/render_form.cpp

@@ -1856,7 +1856,7 @@ void RenderSelect::updateFromElement()
                 // Prefer label if set
                 DOMString label = optElem->getAttribute(ATTR_LABEL);
                 if (!label.isEmpty())
-                    domText = label.string();
+                    domText = label;
                 domText = domText.implementation()->collapseWhiteSpace(false, false);
 
                 QString   text;