2006-03-22 Eric Seidel <eseidel@apple.com>
authoreseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Mar 2006 22:27:45 +0000 (22:27 +0000)
committereseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Mar 2006 22:27:45 +0000 (22:27 +0000)
        Reviewed by darin.

        Replace more DeprecatedString with String.
        http://bugzilla.opendarwin.org/show_bug.cgi?id=7907

        * WebCore+SVG/kdom.h:
        * bindings/objc/DOMHTML.mm:
        (-[DOMHTMLDocument _createDocumentFragmentWithMarkupString:baseURLString:]):
        * bridge/BrowserExtension.h:
        * bridge/mac/BrowserExtensionMac.h:
        * bridge/mac/BrowserExtensionMac.mm:
        (WebCore::BrowserExtensionMac::setTypedIconURL):
        * bridge/mac/FrameMac.h:
        * bridge/mac/FrameMac.mm:
        (WebCore::FrameMac::searchForLabelsBeforeElement):
        (WebCore::nsArray):
        (WebCore::FrameMac::createPlugin):
        (WebCore::FrameMac::bindingRootObject):
        (WebCore::FrameMac::windowScriptObject):
        (WebCore::FrameMac::windowScriptNPObject):
        (WebCore::FrameMac::partClearedInBegin):
        (WebCore::FrameMac::openURLFromPageCache):
        * bridge/mac/WebCoreFrameBridge.mm:
        (-[WebCoreFrameBridge openURL:reload:contentType:refresh:lastModified:pageCache:]):
        (-[WebCoreFrameBridge scrollToAnchor:]):
        (-[WebCoreFrameBridge URLWithAttributeString:]):
        (-[WebCoreFrameBridge highlightAllMatchesForString:caseSensitive:]):
        * bridge/mac/WebCoreScriptDebugger.mm:
        (-[WebCoreScriptCallFrame evaluateWebScript:]):
        * bridge/mac/WebCoreSettings.mm:
        (-[WebCoreSettings _updateAllViews]):
        (-[WebCoreSettings setStandardFontFamily:]):
        (-[WebCoreSettings setMinimumFontSize:]):
        (-[WebCoreSettings setMinimumLogicalFontSize:]):
        (-[WebCoreSettings setDefaultFontSize:]):
        (-[WebCoreSettings setDefaultFixedFontSize:]):
        (-[WebCoreSettings setUserStyleSheetLocation:]):
        * css/CSSComputedStyleDeclaration.cpp:
        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
        * css/CSSGrammar.y:
        * css/css_stylesheetimpl.cpp:
        (WebCore::MediaList::setMediaText):
        * css/css_valueimpl.cpp:
        (WebCore::quoteStringIfNeeded):
        * css/cssparser.cpp:
        (WebCore::CSSParser::parseColor):
        * css/cssstyleselector.cpp:
        (WebCore::CSSStyleSelector::CSSStyleSelector):
        * css/cssstyleselector.h:
        * dom/Document.cpp:
        (WebCore::Document::resetActiveLinkColor):
        (WebCore::Document::nextState):
        (WebCore::Document::setUserStyleSheet):
        (WebCore::Document::processHttpEquiv):
        (WebCore::Document::recalcStyleSelector):
        * dom/Document.h:
        (WebCore::Document::userStyleSheet):
        (WebCore::Document::setPrintStyleSheet):
        (WebCore::Document::printStyleSheet):
        * editing/markup.cpp:
        (WebCore::createMarkup):
        (WebCore::createFragmentFromMarkup):
        (WebCore::createFragmentFromText):
        * editing/markup.h:
        * html/CanvasRenderingContext2D.cpp:
        (WebCore::CanvasRenderingContext2D::setGlobalCompositeOperation):
        * html/HTMLTokenizer.cpp:
        (WebCore::HTMLTokenizer::scriptHandler):
        * html/html_baseimpl.cpp:
        (WebCore::HTMLFrameElement::openURL):
        (WebCore::HTMLFrameElement::attach):
        * html/html_headimpl.cpp:
        (WebCore::HTMLLinkElement::process):
        (WebCore::HTMLLinkElement::setStyleSheet):
        * html/html_headimpl.h:
        * html/html_imageimpl.cpp:
        (WebCore::HTMLImageElement::parseMappedAttribute):
        * html/html_imageimpl.h:
        (WebCore::HTMLImageElement::compositeOperator):
        * html/html_objectimpl.cpp:
        (WebCore::HTMLAppletElement::createRenderer):
        * ksvg2/svg/SVGStringList.cpp:
        (SVGStringList::reset):
        * kwq/AccessibilityObjectCache.h:
        * kwq/AccessibilityObjectCache.mm:
        (AccessibilityObjectCache::textMarkerForVisiblePosition):
        (AccessibilityObjectCache::postNotificationToTopWebArea):
        (AccessibilityObjectCache::postNotification):
        * kwq/ClipboardMac.mm:
        (WebCore::cocoaTypeFromMIMEType):
        * kwq/KWQKHTMLSettings.h:
        (KHTMLSettings::userStyleSheetLocation):
        (KHTMLSettings::setUserStyleSheetLocation):
        * kwq/KWQLineEdit.h:
        * kwq/KWQLineEdit.mm:
        (QLineEdit::selectedText):
        * loader/CachedCSSStyleSheet.cpp:
        (WebCore::CachedCSSStyleSheet::ref):
        * page/Frame.cpp:
        (WebCore::UserStyleSheetLoader::setStyleSheet):
        (WebCore::Frame::jScriptEnabled):
        (WebCore::Frame::javaEnabled):
        (WebCore::Frame::pluginsEnabled):
        (WebCore::Frame::receivedFirstData):
        (WebCore::Frame::begin):
        (WebCore::Frame::setUserStyleSheet):
        (WebCore::Frame::requestObject):
        (WebCore::Frame::loadPlugin):
        (WebCore::Frame::referrer):
        (WebCore::Frame::lastModified):
        (WebCore::Frame::reparseConfiguration):
        (WebCore::Frame::handleMousePressEventSingleClick):
        (WebCore::Frame::appliedEditing):
        (WebCore::Frame::unappliedEditing):
        (WebCore::Frame::reappliedEditing):
        * page/Frame.h:
        * page/FramePrivate.h:
        (WebCore::FramePrivate::FramePrivate):
        * platform/AtomicString.h:
        (WebCore::AtomicString::AtomicString):
        * platform/DeprecatedString.cpp:
        (DeprecatedString::replace):
        * platform/GraphicsContext.h:
        * platform/Image.h:
        * platform/KURL.cpp:
        * platform/KURL.h:
        * platform/PlatformString.h:
        (WebCore::String::String):
        (WebCore::String::replace):
        * platform/String.cpp:
        (WebCore::operator+):
        * platform/StringImpl.cpp:
        (WebCore::StringImpl::remove):
        (WebCore::parseLength):
        (WebCore::StringImpl::replace):
        * platform/StringImpl.h:
        * platform/mac/GraphicsContextMac.mm:
        (WebCore::GraphicsContext::setCompositeOperation):
        * rendering/RenderHTMLCanvas.cpp:
        (WebCore::RenderHTMLCanvas::paint):
        * rendering/render_form.cpp:
        (WebCore::RenderSelect::updateFromElement):
        * rendering/render_frames.cpp:
        (WebCore::isURLAllowed):
        (WebCore::mapClassIdToServiceType):
        (WebCore::RenderPartObject::updateWidget):
        * rendering/render_style.h:
        (WebCore::RenderStyle::setDashboardRegion):
        * xml/xmlhttprequest.cpp:
        (WebCore::getCharset):
        (WebCore::XMLHttpRequest::send):
        (WebCore::XMLHttpRequest::overrideMIMEType):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13440 268f45cc-cd09-0410-ab3c-d52691b4dbfc

57 files changed:
WebCore/ChangeLog
WebCore/WebCore+SVG/kdom.h
WebCore/bindings/objc/DOMHTML.mm
WebCore/bridge/BrowserExtension.h
WebCore/bridge/mac/BrowserExtensionMac.h
WebCore/bridge/mac/BrowserExtensionMac.mm
WebCore/bridge/mac/FrameMac.h
WebCore/bridge/mac/FrameMac.mm
WebCore/bridge/mac/WebCoreFrameBridge.mm
WebCore/bridge/mac/WebCoreScriptDebugger.mm
WebCore/bridge/mac/WebCoreSettings.mm
WebCore/css/CSSComputedStyleDeclaration.cpp
WebCore/css/CSSGrammar.y
WebCore/css/css_stylesheetimpl.cpp
WebCore/css/css_valueimpl.cpp
WebCore/css/cssparser.cpp
WebCore/css/cssstyleselector.cpp
WebCore/css/cssstyleselector.h
WebCore/dom/Document.cpp
WebCore/dom/Document.h
WebCore/editing/markup.cpp
WebCore/editing/markup.h
WebCore/html/CanvasRenderingContext2D.cpp
WebCore/html/HTMLTokenizer.cpp
WebCore/html/html_baseimpl.cpp
WebCore/html/html_headimpl.cpp
WebCore/html/html_headimpl.h
WebCore/html/html_imageimpl.cpp
WebCore/html/html_imageimpl.h
WebCore/html/html_objectimpl.cpp
WebCore/ksvg2/svg/SVGStringList.cpp
WebCore/kwq/AccessibilityObjectCache.h
WebCore/kwq/AccessibilityObjectCache.mm
WebCore/kwq/ClipboardMac.mm
WebCore/kwq/KWQKHTMLSettings.h
WebCore/kwq/KWQLineEdit.h
WebCore/kwq/KWQLineEdit.mm
WebCore/loader/CachedCSSStyleSheet.cpp
WebCore/page/Frame.cpp
WebCore/page/Frame.h
WebCore/page/FramePrivate.h
WebCore/platform/AtomicString.h
WebCore/platform/DeprecatedString.cpp
WebCore/platform/GraphicsContext.h
WebCore/platform/Image.h
WebCore/platform/KURL.cpp
WebCore/platform/KURL.h
WebCore/platform/PlatformString.h
WebCore/platform/String.cpp
WebCore/platform/StringImpl.cpp
WebCore/platform/StringImpl.h
WebCore/platform/mac/GraphicsContextMac.mm
WebCore/rendering/RenderHTMLCanvas.cpp
WebCore/rendering/render_form.cpp
WebCore/rendering/render_frames.cpp
WebCore/rendering/render_style.h
WebCore/xml/xmlhttprequest.cpp

index 0e435eaed27d4d6181ab5b456af26484ea7ee7c1..aa452f1a917ada24239300bb7884d2d1fb52fc9a 100644 (file)
@@ -1,3 +1,158 @@
+2006-03-22  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by darin.
+
+        Replace more DeprecatedString with String.
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=7907
+
+        * WebCore+SVG/kdom.h:
+        * bindings/objc/DOMHTML.mm:
+        (-[DOMHTMLDocument _createDocumentFragmentWithMarkupString:baseURLString:]):
+        * bridge/BrowserExtension.h:
+        * bridge/mac/BrowserExtensionMac.h:
+        * bridge/mac/BrowserExtensionMac.mm:
+        (WebCore::BrowserExtensionMac::setTypedIconURL):
+        * bridge/mac/FrameMac.h:
+        * bridge/mac/FrameMac.mm:
+        (WebCore::FrameMac::searchForLabelsBeforeElement):
+        (WebCore::nsArray):
+        (WebCore::FrameMac::createPlugin):
+        (WebCore::FrameMac::bindingRootObject):
+        (WebCore::FrameMac::windowScriptObject):
+        (WebCore::FrameMac::windowScriptNPObject):
+        (WebCore::FrameMac::partClearedInBegin):
+        (WebCore::FrameMac::openURLFromPageCache):
+        * bridge/mac/WebCoreFrameBridge.mm:
+        (-[WebCoreFrameBridge openURL:reload:contentType:refresh:lastModified:pageCache:]):
+        (-[WebCoreFrameBridge scrollToAnchor:]):
+        (-[WebCoreFrameBridge URLWithAttributeString:]):
+        (-[WebCoreFrameBridge highlightAllMatchesForString:caseSensitive:]):
+        * bridge/mac/WebCoreScriptDebugger.mm:
+        (-[WebCoreScriptCallFrame evaluateWebScript:]):
+        * bridge/mac/WebCoreSettings.mm:
+        (-[WebCoreSettings _updateAllViews]):
+        (-[WebCoreSettings setStandardFontFamily:]):
+        (-[WebCoreSettings setMinimumFontSize:]):
+        (-[WebCoreSettings setMinimumLogicalFontSize:]):
+        (-[WebCoreSettings setDefaultFontSize:]):
+        (-[WebCoreSettings setDefaultFixedFontSize:]):
+        (-[WebCoreSettings setUserStyleSheetLocation:]):
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * css/CSSGrammar.y:
+        * css/css_stylesheetimpl.cpp:
+        (WebCore::MediaList::setMediaText):
+        * css/css_valueimpl.cpp:
+        (WebCore::quoteStringIfNeeded):
+        * css/cssparser.cpp:
+        (WebCore::CSSParser::parseColor):
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::CSSStyleSelector):
+        * css/cssstyleselector.h:
+        * dom/Document.cpp:
+        (WebCore::Document::resetActiveLinkColor):
+        (WebCore::Document::nextState):
+        (WebCore::Document::setUserStyleSheet):
+        (WebCore::Document::processHttpEquiv):
+        (WebCore::Document::recalcStyleSelector):
+        * dom/Document.h:
+        (WebCore::Document::userStyleSheet):
+        (WebCore::Document::setPrintStyleSheet):
+        (WebCore::Document::printStyleSheet):
+        * editing/markup.cpp:
+        (WebCore::createMarkup):
+        (WebCore::createFragmentFromMarkup):
+        (WebCore::createFragmentFromText):
+        * editing/markup.h:
+        * html/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::setGlobalCompositeOperation):
+        * html/HTMLTokenizer.cpp:
+        (WebCore::HTMLTokenizer::scriptHandler):
+        * html/html_baseimpl.cpp:
+        (WebCore::HTMLFrameElement::openURL):
+        (WebCore::HTMLFrameElement::attach):
+        * html/html_headimpl.cpp:
+        (WebCore::HTMLLinkElement::process):
+        (WebCore::HTMLLinkElement::setStyleSheet):
+        * html/html_headimpl.h:
+        * html/html_imageimpl.cpp:
+        (WebCore::HTMLImageElement::parseMappedAttribute):
+        * html/html_imageimpl.h:
+        (WebCore::HTMLImageElement::compositeOperator):
+        * html/html_objectimpl.cpp:
+        (WebCore::HTMLAppletElement::createRenderer):
+        * ksvg2/svg/SVGStringList.cpp:
+        (SVGStringList::reset):
+        * kwq/AccessibilityObjectCache.h:
+        * kwq/AccessibilityObjectCache.mm:
+        (AccessibilityObjectCache::textMarkerForVisiblePosition):
+        (AccessibilityObjectCache::postNotificationToTopWebArea):
+        (AccessibilityObjectCache::postNotification):
+        * kwq/ClipboardMac.mm:
+        (WebCore::cocoaTypeFromMIMEType):
+        * kwq/KWQKHTMLSettings.h:
+        (KHTMLSettings::userStyleSheetLocation):
+        (KHTMLSettings::setUserStyleSheetLocation):
+        * kwq/KWQLineEdit.h:
+        * kwq/KWQLineEdit.mm:
+        (QLineEdit::selectedText):
+        * loader/CachedCSSStyleSheet.cpp:
+        (WebCore::CachedCSSStyleSheet::ref):
+        * page/Frame.cpp:
+        (WebCore::UserStyleSheetLoader::setStyleSheet):
+        (WebCore::Frame::jScriptEnabled):
+        (WebCore::Frame::javaEnabled):
+        (WebCore::Frame::pluginsEnabled):
+        (WebCore::Frame::receivedFirstData):
+        (WebCore::Frame::begin):
+        (WebCore::Frame::setUserStyleSheet):
+        (WebCore::Frame::requestObject):
+        (WebCore::Frame::loadPlugin):
+        (WebCore::Frame::referrer):
+        (WebCore::Frame::lastModified):
+        (WebCore::Frame::reparseConfiguration):
+        (WebCore::Frame::handleMousePressEventSingleClick):
+        (WebCore::Frame::appliedEditing):
+        (WebCore::Frame::unappliedEditing):
+        (WebCore::Frame::reappliedEditing):
+        * page/Frame.h:
+        * page/FramePrivate.h:
+        (WebCore::FramePrivate::FramePrivate):
+        * platform/AtomicString.h:
+        (WebCore::AtomicString::AtomicString):
+        * platform/DeprecatedString.cpp:
+        (DeprecatedString::replace):
+        * platform/GraphicsContext.h:
+        * platform/Image.h:
+        * platform/KURL.cpp:
+        * platform/KURL.h:
+        * platform/PlatformString.h:
+        (WebCore::String::String):
+        (WebCore::String::replace):
+        * platform/String.cpp:
+        (WebCore::operator+):
+        * platform/StringImpl.cpp:
+        (WebCore::StringImpl::remove):
+        (WebCore::parseLength):
+        (WebCore::StringImpl::replace):
+        * platform/StringImpl.h:
+        * platform/mac/GraphicsContextMac.mm:
+        (WebCore::GraphicsContext::setCompositeOperation):
+        * rendering/RenderHTMLCanvas.cpp:
+        (WebCore::RenderHTMLCanvas::paint):
+        * rendering/render_form.cpp:
+        (WebCore::RenderSelect::updateFromElement):
+        * rendering/render_frames.cpp:
+        (WebCore::isURLAllowed):
+        (WebCore::mapClassIdToServiceType):
+        (WebCore::RenderPartObject::updateWidget):
+        * rendering/render_style.h:
+        (WebCore::RenderStyle::setDashboardRegion):
+        * xml/xmlhttprequest.cpp:
+        (WebCore::getCharset):
+        (WebCore::XMLHttpRequest::send):
+        (WebCore::XMLHttpRequest::overrideMIMEType):
+
 2006-03-22  Beth Dakin  <bdakin@apple.com>
 
         Reviewed by Hyatt
index 6edfb4da823f6d135e8e927163b4a97170e3d7e7..fc888e2b31f6e11501d36bdcd9df61a5ef4d90ee 100644 (file)
@@ -25,9 +25,6 @@
 #define KDOM_H
 #if SVG_SUPPORT
 
-#include "DeprecatedString.h"
-#include "PlatformString.h"
-
 /**
  * @short General namespace specific definitions.
  */
index 705ed26d74f263c0817c0d8fb91c2a85f4e1c7cd..36959e8c41869e1eda246de42781fa584191dfea 100644 (file)
@@ -510,7 +510,7 @@ using namespace WebCore::HTMLNames;
 
 - (DOMDocumentFragment *)_createDocumentFragmentWithMarkupString:(NSString *)markupString baseURLString:(NSString *)baseURLString
 {
-    RefPtr<DocumentFragment> fragment = createFragmentFromMarkup([self _document], DeprecatedString::fromNSString(markupString), DeprecatedString::fromNSString(baseURLString));
+    RefPtr<DocumentFragment> fragment = createFragmentFromMarkup([self _document], markupString, baseURLString);
     return [DOMDocumentFragment _documentFragmentWith:fragment.get()];
 }
 
index a28c75f0a13269288d61bf54eb8c0c0ab6cd9086..251ffbbde96fdbefd7108b4a665db0aaccdf0d94 100644 (file)
@@ -69,7 +69,7 @@ public:
                                  Frame*& part) = 0;
     
     virtual void setIconURL(const KURL&) = 0;
-    virtual void setTypedIconURL(const KURL&, const DeprecatedString& type) = 0;
+    virtual void setTypedIconURL(const KURL&, const String& type) = 0;
     
     virtual int getHistoryLength() = 0;
     virtual void goBackOrForward(int distance) = 0;
index df11bc49d438d0b453502e1de63869e2fa809d60..cd23f376ee8966edec34fadaab2b6fb1e34b943f 100644 (file)
@@ -40,7 +40,7 @@ public:
                                  Frame*& part);
 
     virtual void setIconURL(const KURL&);
-    virtual void setTypedIconURL(const KURL&, const DeprecatedString& type);
+    virtual void setTypedIconURL(const KURL&, const String& type);
 
     virtual int getHistoryLength();
     virtual void goBackOrForward(int distance);
index 0cb1f788ddbf576255800531409a7a520a920da5..23092c3d32fbe066d05d4c8c995c49aa0707cf1b 100644 (file)
@@ -162,10 +162,10 @@ void BrowserExtensionMac::setIconURL(const KURL &url)
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-void BrowserExtensionMac::setTypedIconURL(const KURL &url, const DeprecatedString &type)
+void BrowserExtensionMac::setTypedIconURL(const KURL &url, const String &type)
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    [m_frame->bridge() setIconURL:url.getNSURL() withType:type.getNSString()];
+    [m_frame->bridge() setIconURL:url.getNSURL() withType:type];
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
index 4c46e544b3cde8e7e0b81ec2bfad3b9463b50923..a5ef847db58a9353139530b6ec9454938d408583 100644 (file)
@@ -140,7 +140,7 @@ public:
     virtual void urlSelected(const ResourceRequest&);
 
     virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
-    virtual Plugin* createPlugin(const KURL& url, const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues, const String& mimeType);
+    virtual Plugin* createPlugin(const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType);
     virtual Frame* createFrame(const KURL& url, const String& name, RenderPart* renderer, const String& referrer);
 
     virtual void scheduleClose();
index fefe01c9dea2f582949e77b77b251503befd3a50..5a27a2e3e3ee17260a579f445fed12607ad55004 100644 (file)
@@ -331,14 +331,12 @@ NSString *FrameMac::searchForLabelsBeforeElement(NSArray *labels, Element *eleme
                 return result;
             }
             searchedCellAbove = true;
-        } else if (n->isTextNode() && n->renderer() && n->renderer()->style()->visibility() == VISIBLE)
-        {
+        } else if (n->isTextNode() && n->renderer() && n->renderer()->style()->visibility() == VISIBLE) {
             // For each text chunk, run the regexp
             DeprecatedString nodeString = n->nodeValue().deprecatedString();
             // add 100 for slop, to make it more likely that we'll search whole nodes
-            if (lengthSearched + nodeString.length() > maxCharsSearched) {
+            if (lengthSearched + nodeString.length() > maxCharsSearched)
                 nodeString = nodeString.right(charsSearchedThreshold - lengthSearched);
-            }
             int pos = regExp->searchRev(nodeString);
             if (pos >= 0)
                 return nodeString.mid(pos, regExp->matchedLength()).getNSString();
@@ -525,14 +523,22 @@ ObjectContentType FrameMac::objectContentType(const KURL& url, const String& mim
     return (ObjectContentType)[_bridge determineObjectFromMIMEType:mimeType URL:url.getNSURL()];
 }
 
+static NSArray* nsArray(const Vector<String>& vector)
+{
+    unsigned len = vector.size();
+    NSMutableArray* array = [NSMutableArray arrayWithCapacity:len];
+    for (unsigned x = 0; x < len; x++)
+        [array addObject:vector[x]];
+    return array;
+}
 
-Plugin* FrameMac::createPlugin(const KURL& url, const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues, const String& mimeType)
+Plugin* FrameMac::createPlugin(const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType)
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
     return new Plugin(new Widget([_bridge viewForPluginWithURL:url.getNSURL()
-                                  attributeNames:paramNames.getNSArray()
-                                  attributeValues:paramValues.getNSArray()
+                                  attributeNames:nsArray(paramNames)
+                                  attributeValues:nsArray(paramValues)
                                   MIMEType:mimeType]));
 
     END_BLOCK_OBJC_EXCEPTIONS;
@@ -1041,7 +1047,7 @@ KJS::Bindings::RootObject *FrameMac::executionContextForDOM()
 
 KJS::Bindings::RootObject *FrameMac::bindingRootObject()
 {
-    assert(d->m_bJScriptEnabled);
+    assert(jScriptEnabled());
     if (!_bindingRoot) {
         JSLock lock;
         _bindingRoot = new KJS::Bindings::RootObject(0);    // The root gets deleted by JavaScriptCore.
@@ -1055,7 +1061,7 @@ KJS::Bindings::RootObject *FrameMac::bindingRootObject()
 
 WebScriptObject *FrameMac::windowScriptObject()
 {
-    if (!d->m_bJScriptEnabled)
+    if (!jScriptEnabled())
         return 0;
 
     if (!_windowScriptObject) {
@@ -1070,7 +1076,7 @@ WebScriptObject *FrameMac::windowScriptObject()
 NPObject *FrameMac::windowScriptNPObject()
 {
     if (!_windowScriptNPObject) {
-        if (d->m_bJScriptEnabled) {
+        if (jScriptEnabled()) {
             // JavaScript is enabled, so there is a JavaScript window object.  Return an NPObject bound to the window
             // object.
             KJS::JSObject *win = KJS::Window::retrieveWindow(this);
@@ -1088,7 +1094,7 @@ NPObject *FrameMac::windowScriptNPObject()
 
 void FrameMac::partClearedInBegin()
 {
-    if (d->m_bJScriptEnabled)
+    if (jScriptEnabled())
         [_bridge windowObjectCleared];
 }
 
@@ -1117,7 +1123,7 @@ void FrameMac::openURLFromPageCache(KWQPageState *state)
     d->m_bLoadEventEmitted = true;
     
     // delete old status bar msg's from kjs (if it _was_ activated on last URL)
-    if (d->m_bJScriptEnabled) {
+    if (jScriptEnabled()) {
         d->m_kjsStatusBarText = String();
         d->m_kjsDefaultStatusBarText = String();
     }
index c4000911606bff480983b2ecb8bb43fa45eef7b0..bdef1b6e1d3689567f013833784b7a5b5e8f7787 100644 (file)
@@ -531,18 +531,18 @@ static inline WebCoreFrameBridge *bridge(Frame *frame)
     ResourceRequest request(m_frame->resourceRequest());
     request.reload = reload;
     if (contentType)
-        request.m_responseMIMEType = DeprecatedString::fromNSString(contentType);
+        request.m_responseMIMEType = contentType;
     m_frame->setResourceRequest(request);
 
     // opening the URL
     if (m_frame->didOpenURL(URL)) {
         // things we have to set up after calling didOpenURL
         if (refresh) {
-            m_frame->addMetaData("http-refresh", DeprecatedString::fromNSString(refresh));
+            m_frame->addMetaData("http-refresh", refresh);
         }
         if (lastModified) {
             NSString *modifiedString = [lastModified descriptionWithCalendarFormat:@"%a %b %d %Y %H:%M:%S" timeZone:nil locale:nil];
-            m_frame->addMetaData("modified", DeprecatedString::fromNSString(modifiedString));
+            m_frame->addMetaData("modified", modifiedString);
         }
     }
 }
@@ -737,9 +737,9 @@ static inline WebCoreFrameBridge *bridge(Frame *frame)
         frameView->setMarginHeight(mh);
 }
 
-- (void)scrollToAnchor:(NSString *)a
+- (void)scrollToAnchor:(NSString *)anchor
 {
-    m_frame->gotoAnchor(DeprecatedString::fromNSString(a));
+    m_frame->gotoAnchor(anchor);
 }
 
 - (BOOL)isSelectionEditable
@@ -1200,11 +1200,10 @@ static HTMLFormElement *formElementFromDOMElement(DOMElement *element)
 - (NSURL *)URLWithAttributeString:(NSString *)string
 {
     Document *doc = m_frame->document();
-    if (!doc) {
+    if (!doc)
         return nil;
-    }
     // FIXME: is parseURL appropriate here?
-    DeprecatedString rel = parseURL(DeprecatedString::fromNSString(string)).deprecatedString();
+    DeprecatedString rel = parseURL(string).deprecatedString();
     return KURL(doc->completeURL(rel)).getNSURL();
 }
 
@@ -1215,7 +1214,7 @@ static HTMLFormElement *formElementFromDOMElement(DOMElement *element)
 
 - (unsigned)highlightAllMatchesForString:(NSString *)string caseSensitive:(BOOL)caseFlag
 {
-    return m_frame->highlightAllMatchesForString(DeprecatedString::fromNSString(string), caseFlag);
+    return m_frame->highlightAllMatchesForString(string, caseFlag);
 }
 
 - (void)clearHighlightedMatches
index 3cb5a2891bd2eb7615da64ec72b7b2b47cecd206..2672ace1fb6b9d14014396d1494d9e78c9d6c134 100644 (file)
@@ -322,13 +322,11 @@ class WebCoreScriptDebuggerImp : public KJS::Debugger {
     JSObject *eval = NULL;
     if (state->context().imp()) {  // "eval" won't work without context (i.e. at global scope)
         JSValue *v = globObj->get(state, "eval");
-        if (v->isObject() && static_cast<JSObject *>(v)->implementsCall()) {
+        if (v->isObject() && static_cast<JSObject *>(v)->implementsCall())
             eval = static_cast<JSObject *>(v);
-        }
-        else {
+        else
             // no "eval" - fallback operates on global exec state
             state = interp->globalExec();
-        }
     }
 
     JSValue *savedException = state->exception();
@@ -341,15 +339,12 @@ class WebCoreScriptDebuggerImp : public KJS::Debugger {
         List args;
         args.append(jsString(code));
         result = eval->call(state, NULL, args);
-    }
-    else {
+    } else
         // no "eval", or no context (i.e. global scope) - use global fallback
         result = interp->imp()->evaluate(code.data(), code.size(), globObj, UString(), 0).value();
-    }
 
-    if (state->hadException()) {
+    if (state->hadException())
         result = state->exception();    // (may be redundant depending on which eval path was used)
-    }
     state->setException(savedException);
 
     return [self _convertValueToObjcValue:result];
index 5b9ffffef80fd7743aa9917a3f837ae0fee00d4a..ab03414bbd0ac3a9693d5e2d8162ef0741a91c28 100644 (file)
@@ -69,17 +69,15 @@ using namespace WebCore;
 {
     for (DeprecatedPtrListIterator<Frame> it(Frame::instances()); it.current(); ++it) {
         FrameMac *frame = Mac(it.current());
-        if (frame->settings() == settings) {
+        if (frame->settings() == settings)
             [frame->bridge() setNeedsReapplyStyles];
-        }
     }
 }
 
 - (void)setStandardFontFamily:(NSString *)s
 {
-    if ([standardFontFamily isEqualToString:s]) {
+    if ([standardFontFamily isEqualToString:s])
         return;
-    }
     [standardFontFamily release];
     standardFontFamily = [s copy];
     settings->setStdFontName(s);
@@ -168,9 +166,8 @@ using namespace WebCore;
 
 - (void)setMinimumFontSize:(float)size
 {
-    if (minimumFontSize == size) {
+    if (minimumFontSize == size)
         return;
-    }
     minimumFontSize = size;
     settings->setMinFontSize((int)rint(size));
     [self _updateAllViews];
@@ -183,9 +180,8 @@ using namespace WebCore;
 
 - (void)setMinimumLogicalFontSize:(float)size
 {
-    if (minimumLogicalFontSize == size) {
+    if (minimumLogicalFontSize == size)
         return;
-    }
     minimumLogicalFontSize = size;
     settings->setMinLogicalFontSize((int)rint(size));
     [self _updateAllViews];
@@ -198,9 +194,8 @@ using namespace WebCore;
 
 - (void)setDefaultFontSize:(float)size
 {
-    if (defaultFontSize == size) {
+    if (defaultFontSize == size)
         return;
-    }
     defaultFontSize = size;
     settings->setMediumFontSize((int)rint(size));
     [self _updateAllViews];
@@ -213,9 +208,8 @@ using namespace WebCore;
 
 - (void)setDefaultFixedFontSize:(float)size
 {
-    if (defaultFixedFontSize == size) {
+    if (defaultFixedFontSize == size)
         return;
-    }
     defaultFixedFontSize = size;
     settings->setMediumFixedFontSize((int)rint(size));
     [self _updateAllViews];
@@ -287,7 +281,7 @@ using namespace WebCore;
         return;
     [userStyleSheetLocation release];
     userStyleSheetLocation = [s copy];
-    settings->setUserStyleSheet(DeprecatedString::fromNSString(s));
+    settings->setUserStyleSheetLocation(DeprecatedString::fromNSString(s));
     [self _updateAllViews];
 }
 
index 75a6b4ee5b38a7ae4b68e4b8bf0c8248af9f0c4c..9592a7179e49545888938f5373eaa337a38f2e28 100644 (file)
@@ -954,7 +954,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         return valueForTextAlign(style->textAlign());
     case CSS_PROP_TEXT_DECORATION:
     {
-        DeprecatedString string;
+        String string;
         if (style->textDecoration() & UNDERLINE)
             string += "underline";
         if (style->textDecoration() & OVERLINE) {
@@ -978,7 +978,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
     }
     case CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT:
     {
-        DeprecatedString string;
+        String string;
         if (style->textDecorationsInEffect() & UNDERLINE)
             string += "underline";
         if (style->textDecorationsInEffect() & OVERLINE) {
index 75b3627d9517650070badb3e09a9274b90ed0bfa..da0c89fc6e92f3b2c40ac224ee0e2d7df55da1ef 100644 (file)
@@ -828,7 +828,7 @@ declaration:
 property:
     IDENT maybe_space {
         DeprecatedString str = qString($1);
-        $$ = getPropertyID( str.lower().latin1(), str.length() );
+        $$ = getPropertyID(str.lower().latin1(), str.length());
 #if SVG_SUPPORT
       if ($$ == 0)
           $$ = SVG::getSVGCSSPropertyID(str.lower().latin1(), str.length());
index ef8c797ebe45b97f17670a28df1a28701933556f..dd59b333cfaa1490b0c7466d6b1751c82333ded4 100644 (file)
@@ -336,12 +336,11 @@ WebCore::String MediaList::mediaText() const
 void MediaList::setMediaText(const WebCore::String &value)
 {
     m_lstMedia.clear();
-    DeprecatedStringList list = DeprecatedStringList::split( ',', value.deprecatedString() );
-    for ( DeprecatedStringList::Iterator it = list.begin(); it != list.end(); ++it )
-    {
+    DeprecatedStringList list = DeprecatedStringList::split(',', value.deprecatedString());
+    for (DeprecatedStringList::Iterator it = list.begin(); it != list.end(); ++it) {
         String medium = (*it).stripWhiteSpace();
         if (!medium.isEmpty())
-            m_lstMedia.append( medium );
+            m_lstMedia.append(medium);
     }
 }
 
index 2c3ce47eaf8102a583f49f8d49a07f70fad683f3..3362ab7f4cf6c7e62de919d2ffea7e95bdedaf1b 100644 (file)
@@ -87,7 +87,7 @@ static String quoteStringIfNeeded(const String &string)
         return string;
 
     // FIXME: Also need to transform control characters into \ sequences.
-    DeprecatedString s = string.deprecatedString();
+    String s = string;
     s.replace('\\', "\\\\");
     s.replace('\'', "\\'");
     return '\'' + s + '\'';
index cec8ce8e9989061a85f609dd019f0208875d1f44..b193309246ba59ccf1aae7b6ad805aa4fe3627de 100644 (file)
@@ -2084,10 +2084,9 @@ bool CSSParser::parseColor(const DeprecatedString &name, RGBA32& rgb)
 {
     int len = name.length();
 
-    if ( !len )
+    if (!len)
         return false;
 
-
     bool ok;
 
     if ( len == 3 || len == 6 ) {
index b287fe1c932245bf6479b607d82e19e29b0f548d..42de81dac675b2d963634be82466e6bfa4cd5639 100644 (file)
@@ -197,7 +197,7 @@ CSSStyleSheet *CSSStyleSelector::svgSheet = 0;
 static CSSStyleSelector::Encodedurl *currentEncodedURL = 0;
 static PseudoState pseudoState;
 
-CSSStyleSelector::CSSStyleSelector(Document* doc, DeprecatedString userStyleSheet, StyleSheetList *styleSheets, bool _strictParsing)
+CSSStyleSelector::CSSStyleSelector(Document* doc, const String& userStyleSheet, StyleSheetList *styleSheets, bool _strictParsing)
 {
     init();
 
@@ -214,7 +214,7 @@ CSSStyleSelector::CSSStyleSelector(Document* doc, DeprecatedString userStyleShee
     // FIXME: This sucks! The user sheet is reparsed every time!
     if (!userStyleSheet.isEmpty()) {
         m_userSheet = new CSSStyleSheet(doc);
-        m_userSheet->parseString(String(userStyleSheet), strictParsing);
+        m_userSheet->parseString(userStyleSheet, strictParsing);
 
         m_userStyle = new CSSRuleSet();
         m_userStyle->addRulesFromSheet(m_userSheet, m_mediaType);
index c293b6e39714e06b722a2dc43b8a45ad96fafd68..ffb65e9eaa320685108a97182c37d34f931a9798 100644 (file)
@@ -78,9 +78,7 @@ class StyledElement;
          * goes through all StyleSheets defined in the document and
          * creates a list of rules it needs to apply to objects
          */
-        CSSStyleSelector(Document* doc, DeprecatedString userStyleSheet, 
-                         StyleSheetList *styleSheets,
-                         bool _strictParsing);
+        CSSStyleSelector(Document*, const String& userStyleSheet, StyleSheetList *styleSheets, bool strictParsing);
         /**
          * same as above but for a single stylesheet.
          */
index 51c0727cdea83fd9e4ff2f48c5d58a9deb5c54eb..fc13309812f7a7b62096aedb3ca294a61f6a4f2a 100644 (file)
@@ -367,7 +367,7 @@ void Document::resetVisitedLinkColor()
 
 void Document::resetActiveLinkColor()
 {
-    m_activeLinkColor.setNamedColor(DeprecatedString("red"));
+    m_activeLinkColor.setNamedColor("red");
 }
 
 void Document::setDocType(PassRefPtr<DocumentType> docType)
@@ -715,8 +715,7 @@ Node::NodeType Document::nodeType() const
 DeprecatedString Document::nextState()
 {
    DeprecatedString state;
-   if (!m_state.isEmpty())
-   {
+   if (!m_state.isEmpty()) {
       state = m_state.first();
       m_state.remove(m_state.begin());
    }
@@ -1327,7 +1326,7 @@ void Document::setStyleSheet(const String &url, const String &sheet)
     updateStyleSelector();
 }
 
-void Document::setUserStyleSheet(const DeprecatedString& sheet)
+void Document::setUserStyleSheet(const String& sheet)
 {
     if (m_usersheet != sheet) {
         m_usersheet = sheet;
@@ -1578,9 +1577,7 @@ void Document::processHttpEquiv(const String &equiv, const String &content)
         m_selectedStylesheetSet = content;
         m_preferredStylesheetSet = content;
         updateStyleSelector();
-    }
-    else if (equalIgnoringCase(equiv, "refresh") && frame->metaRefreshEnabled())
-    {
+    } else if (equalIgnoringCase(equiv, "refresh")) {
         // get delay and url
         DeprecatedString str = content.deprecatedString().stripWhiteSpace();
         int pos = str.find(RegularExpression("[;,]"));
@@ -1593,7 +1590,8 @@ void Document::processHttpEquiv(const String &equiv, const String &content)
             int delay = 0;
             delay = str.toInt(&ok);
             // We want a new history item if the refresh timeout > 1 second
-            if(ok && frame) frame->scheduleRedirection(delay, frame->url().url(), delay <= 1);
+            if (ok && frame)
+                frame->scheduleRedirection(delay, frame->url().url(), delay <= 1);
         } else {
             double delay = 0;
             bool ok = false;
@@ -1612,22 +1610,16 @@ void Document::processHttpEquiv(const String &equiv, const String &content)
                 // We want a new history item if the refresh timeout > 1 second
                 frame->scheduleRedirection(delay, completeURL(str), delay <= 1);
         }
-    }
-    else if (equalIgnoringCase(equiv, "expires"))
-    {
+    } else if (equalIgnoringCase(equiv, "expires")) {
         DeprecatedString str = content.deprecatedString().stripWhiteSpace();
         time_t expire_date = str.toInt();
         if (m_docLoader)
             m_docLoader->setExpireDate(expire_date);
-    }
-    else if ((equalIgnoringCase(equiv, "pragma") || equalIgnoringCase(equiv, "cache-control")) && frame)
-    {
+    } else if ((equalIgnoringCase(equiv, "pragma") || equalIgnoringCase(equiv, "cache-control")) && frame) {
         DeprecatedString str = content.deprecatedString().lower().stripWhiteSpace();
         KURL url = frame->url();
-    }
-    else if (equalIgnoringCase(equiv, "set-cookie"))
-    {
-        // ### make setCookie work on XML documents too; e.g. in case of <html:meta .....>
+    } else if (equalIgnoringCase(equiv, "set-cookie")) {
+        // ### FIXME: make setCookie work on XML documents too; e.g. in case of <html:meta .....>
         if (isHTMLDocument())
             static_cast<HTMLDocument *>(this)->setCookie(content);
     }
@@ -1910,7 +1902,7 @@ void Document::recalcStyleSelector()
 
     // Create a new style selector
     delete m_styleSelector;
-    DeprecatedString usersheet = m_usersheet;
+    String usersheet = m_usersheet;
     if (m_view && m_view->mediaType() == "print")
         usersheet += m_printSheet;
     m_styleSelector = new CSSStyleSelector(this, usersheet, m_styleSheets.get(), !inCompatMode());
index 43d01ce983bc341cf9cd0f4d9777f5e300228a37..50baaa0424a249979b14810624b20daed2a97ad3 100644 (file)
@@ -280,10 +280,10 @@ public:
 
     // from cachedObjectClient
     virtual void setStyleSheet(const String& url, const String& sheetStr);
-    void setUserStyleSheet(const DeprecatedString& sheet);
-    DeprecatedString userStyleSheet() const { return m_usersheet; }
-    void setPrintStyleSheet(const DeprecatedString& sheet) { m_printSheet = sheet; }
-    DeprecatedString printStyleSheet() const { return m_printSheet; }
+    void setUserStyleSheet(const String& sheet);
+    const String& userStyleSheet() const { return m_usersheet; }
+    void setPrintStyleSheet(const String& sheet) { m_printSheet = sheet; }
+    const String& printStyleSheet() const { return m_printSheet; }
 
     CSSStyleSheet* elementSheet();
     virtual Tokenizer* createTokenizer();
@@ -547,8 +547,8 @@ protected:
     RefPtr<DOMImplementation> m_implementation;
 
     RefPtr<StyleSheet> m_sheet;
-    DeprecatedString m_usersheet;
-    DeprecatedString m_printSheet;
+    String m_usersheet;
+    String m_printSheet;
     DeprecatedStringList m_availableSheets;
 
     // Track the number of currently loading top-level stylesheets.  Sheets
index 9b95e86ea26f981a3155121e5a0aa7528891eabe..f7acb670dd2ec597336cd2eee66850b25031c54a 100644 (file)
@@ -333,12 +333,10 @@ DeprecatedString createMarkup(const Range *range, DeprecatedPtrList<Node> *nodes
     doc->updateLayoutIgnorePendingStylesheets();
 
     Node *commonAncestorBlock = 0;
-    if (commonAncestor != 0) {
+    if (commonAncestor)
         commonAncestorBlock = commonAncestor->enclosingBlockFlowElement();
-    }
-    if (commonAncestorBlock == 0) {
-        return "";    
-    }
+    if (!commonAncestorBlock)
+        return "";
 
     DeprecatedStringList markups;
     Node *pastEnd = range->pastEndNode();
@@ -365,17 +363,15 @@ DeprecatedString createMarkup(const Range *range, DeprecatedPtrList<Node> *nodes
     for (Node *n = startNode; n != pastEnd; n = next) {
         next = n->traverseNextNode();
 
-        if (n->isBlockFlow() && next == pastEnd) {
+        if (n->isBlockFlow() && next == pastEnd)
             // Don't write out an empty block.
             continue;
-        }
         
         // Add the node to the markup.
         if (n->renderer()) {
             markups.append(startMarkup(n, range, annotate, defaultStyle.get()));
-            if (nodes) {
+            if (nodes)
                 nodes->append(n);
-            }
         }
         
         if (n->firstChild() == 0) {
@@ -390,9 +386,8 @@ DeprecatedString createMarkup(const Range *range, DeprecatedPtrList<Node> *nodes
                 if (!ancestorsToClose.isEmpty()) {
                     // Close up the ancestors.
                     while (Node *ancestor = ancestorsToClose.last()) {
-                        if (next != pastEnd && ancestor == next->parentNode()) {
+                        if (next != pastEnd && ancestor == next->parentNode())
                             break;
-                        }
                         // Not at the end of the range, close ancestors up to sibling of next node.
                         markups.append(endMarkup(ancestor));
                         lastClosed = ancestor;
@@ -406,19 +401,17 @@ DeprecatedString createMarkup(const Range *range, DeprecatedPtrList<Node> *nodes
                             for (Node *parent = n->parent(); parent != 0 && parent != nextParent; parent = parent->parentNode()) {
                                 markups.prepend(startMarkup(parent, range, annotate, defaultStyle.get()));
                                 markups.append(endMarkup(parent));
-                                if (nodes) {
+                                if (nodes)
                                     nodes->append(parent);
-                                }                            
                                 lastClosed = parent;
                             }
                         }
                     }
                 }
             }
-        } else if (n->renderer()) {
+        } else if (n->renderer())
             // Node is an ancestor, set it to close eventually.
             ancestorsToClose.append(n);
-        }
     }
     
     Node *rangeStartNode = range->startNode();
@@ -441,18 +434,16 @@ DeprecatedString createMarkup(const Range *range, DeprecatedPtrList<Node> *nodes
                         || ancestor->hasTagName(tableTag)
                         || ancestor->hasTagName(ulTag)) {
                     breakAtEnd = true;
-                } else {
+                } else
                     break;
-                }
             }
             markups.prepend(startMarkup(ancestor, range, annotate, defaultStyle.get()));
             markups.append(endMarkup(ancestor));
             if (nodes) {
                 nodes->append(ancestor);
             }        
-            if (breakAtEnd) {
+            if (breakAtEnd)
                 break;
-            }
         }
     }
 
@@ -478,7 +469,7 @@ DeprecatedString createMarkup(const Range *range, DeprecatedPtrList<Node> *nodes
     return markups.join("");
 }
 
-PassRefPtr<DocumentFragment> createFragmentFromMarkup(Document* document, const DeprecatedString& markup, const DeprecatedString& baseURL)
+PassRefPtr<DocumentFragment> createFragmentFromMarkup(Document* document, const String& markup, const String& baseURL)
 {
     ASSERT(document->documentElement()->isHTMLElement());
     // FIXME: What if the document element is not an HTML element?
@@ -488,7 +479,7 @@ PassRefPtr<DocumentFragment> createFragmentFromMarkup(Document* document, const
     ASSERT(fragment);
 
     if (!baseURL.isEmpty() && baseURL != document->baseURL())
-        completeURLs(fragment.get(), baseURL);
+        completeURLs(fragment.get(), baseURL.deprecatedString());
 
     return fragment.release();
 }
@@ -553,7 +544,7 @@ PassRefPtr<DocumentFragment> createFragmentFromText(Document *document, const De
         DeprecatedString string = text;
 
         // Break string into paragraphs. Extra line breaks turn into empty paragraphs.
-        string.replace(DeprecatedString("\r\n"), "\n");
+        string.replace("\r\n", "\n");
         string.replace('\r', '\n');
         DeprecatedStringList list = DeprecatedStringList::split('\n', string, true); // true gets us empty strings in the list
         while (!list.isEmpty()) {
index 1d5478b6759ef32411d7662ca3c1bd1d65d02fac..c8815013d710e84f0178abc14ef26475a76d909b 100644 (file)
@@ -39,7 +39,7 @@ namespace WebCore {
 enum EChildrenOnly { IncludeNode, ChildrenOnly };
 
 PassRefPtr<WebCore::DocumentFragment> createFragmentFromText(WebCore::Document *document, const DeprecatedString &text);
-PassRefPtr<WebCore::DocumentFragment> createFragmentFromMarkup(WebCore::Document *document, const DeprecatedString &markup, const DeprecatedString &baseURL);
+PassRefPtr<WebCore::DocumentFragment> createFragmentFromMarkup(WebCore::Document *document, const String &markup, const String &baseURL);
 PassRefPtr<WebCore::DocumentFragment> createFragmentFromNodeList(WebCore::Document *document, const DeprecatedPtrList<WebCore::Node> &nodeList);
 
 DeprecatedString createMarkup(const WebCore::Range *range,
index 39677c4f5bb80b8b322e3e89ca7e0cb76af7634d..706cc57a7d2a59f022b9f1e815958863d44f7433 100644 (file)
@@ -280,7 +280,7 @@ void CanvasRenderingContext2D::setGlobalCompositeOperation(const String& operati
 
     // FIXME: Do this through platform-independent GraphicsContext API.
 #if __APPLE__
-    GraphicsContext::setCompositeOperation(drawingContext(), operation.deprecatedString());
+    GraphicsContext::setCompositeOperation(drawingContext(), operation);
 #endif
 }
 
index 53d7cf469c6af04a9867dc6066685bca4a26f2ff..d3cbc32a7e0875a125fe91ce8e24aeeab0a5c59a 100644 (file)
@@ -386,11 +386,10 @@ HTMLTokenizer::State HTMLTokenizer::scriptHandler(State state)
     currentPrependingSrc = &prependingSrc;
     if (!parser->skipMode() && !followingFrameset) {
         if (cs) {
-            if (savedPrependingSrc) {
+            if (savedPrependingSrc)
                 savedPrependingSrc->append(src);
-            } else {
+            else
                 pendingSrc.prepend(src);
-            }
             setSrc(SegmentedString());
             scriptCodeSize = scriptCodeResync = 0;
 
index a63692af4ed650930c6a5d1ec9b8fc6e54d8e9d5..2bc49ddf941f59c826dfc07113730ad301da9e58 100644 (file)
@@ -329,7 +329,7 @@ void HTMLFrameElement::openURL()
     if (Frame* childFrame = parentFrame->tree()->child(m_name))
         childFrame->openURL(getDocument()->completeURL(relativeURL.deprecatedString()));
     else
-        parentFrame->requestFrame(static_cast<RenderFrame *>(renderer()), relativeURL.deprecatedString(), m_name.deprecatedString());
+        parentFrame->requestFrame(static_cast<RenderFrame *>(renderer()), relativeURL, m_name);
 }
 
 
@@ -424,7 +424,7 @@ void HTMLFrameElement::attach()
     m_name = frame->tree()->uniqueChildName(m_name);
 
     // load the frame contents
-    frame->requestFrame(static_cast<RenderFrame*>(renderer()), relativeURL.deprecatedString(), m_name.deprecatedString());
+    frame->requestFrame(static_cast<RenderFrame*>(renderer()), relativeURL, m_name);
 }
 
 void HTMLFrameElement::close()
index 7c9925e456b73a1edde910bbc9299669868024fe..a12cbbd774399f62562a6db830cce7320c7ca44c 100644 (file)
@@ -212,7 +212,7 @@ void HTMLLinkElement::process()
     if (!inDocument())
         return;
 
-    DeprecatedString type = m_type.deprecatedString().lower();
+    String type = m_type.lower();
     
     Frame *frame = getDocument()->frame();
 
@@ -275,7 +275,7 @@ void HTMLLinkElement::setStyleSheet(const String &url, const String &sheetStr)
     m_sheet->parseString(sheetStr, !getDocument()->inCompatMode());
 
     MediaList *media = new MediaList(m_sheet.get(), m_media);
-    m_sheet->setMedia( media );
+    m_sheet->setMedia(media);
 
     m_loading = false;
 
index bd904cc38f0050d030daa12480a29d019d7b4255..f33911cf1abf8c27fb23c364a5e3e3d8e4a653e1 100644 (file)
@@ -135,13 +135,12 @@ protected:
     RefPtr<CSSStyleSheet> m_sheet;
     String m_url;
     String m_type;
-    DeprecatedString m_media;
+    String m_media;
     int m_disabledState; // 0=unset(default), 1=enabled via script, 2=disabled
     bool m_loading : 1;
     bool m_alternate : 1;
     bool m_isStyleSheet : 1;
     bool m_isIcon : 1;
-    DeprecatedString m_data; // needed for temporarily storing the loaded style sheet data
 };
 
 // -------------------------------------------------------------------------
@@ -265,7 +264,7 @@ protected:
     RefPtr<CSSStyleSheet> m_sheet;
     bool m_loading;
     String m_type;
-    DeprecatedString m_media;
+    String m_media;
 };
 
 // -------------------------------------------------------------------------
index a8c867d0434a12e0e269a23796628b0f81414e65..7ee3db21733c9952c90b42e09064c96bedf56a1c 100644 (file)
@@ -159,13 +159,13 @@ void HTMLImageElement::parseMappedAttribute(MappedAttribute *attr)
     if (attrName == altAttr) {
         if (renderer())
             static_cast<RenderImage*>(renderer())->updateAltText();
-    } else if (attrName == srcAttr) {
+    } else if (attrName == srcAttr)
         m_imageLoader.updateFromElement();
-    } else if (attrName == widthAttr) {
+    else if (attrName == widthAttr)
         addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
-    } else if (attrName == heightAttr) {
+    else if (attrName == heightAttr)
         addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
-    else if (attrName == borderAttr) {
+    else if (attrName == borderAttr) {
         // border="noborder" -> border="0"
         if(attr->value().toInt()) {
             addCSSLength(attr, CSS_PROP_BORDER_WIDTH, attr->value());
@@ -180,27 +180,27 @@ void HTMLImageElement::parseMappedAttribute(MappedAttribute *attr)
     } else if (attrName == hspaceAttr) {
         addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
         addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
-    } else if (attrName == alignAttr) {
+    } else if (attrName == alignAttr)
         addHTMLAlignment(attr);
-    } else if (attrName == valignAttr) {
+    else if (attrName == valignAttr)
         addCSSProperty(attr, CSS_PROP_VERTICAL_ALIGN, attr->value());
-    else if (attrName == usemapAttr) {
+    else if (attrName == usemapAttr) {
         if (attr->value().domString()[0] == '#')
             usemap = attr->value();
         else
             usemap = getDocument()->completeURL(parseURL(attr->value()));
         m_isLink = !attr->isNull();
-    } else if (attrName == ismapAttr) {
+    } else if (attrName == ismapAttr)
         ismap = true;
-    } else if (attrName == onabortAttr) {
+    else if (attrName == onabortAttr)
         setHTMLEventListener(abortEvent, attr);
-    } else if (attrName == onerrorAttr) {
+    else if (attrName == onerrorAttr)
         setHTMLEventListener(errorEvent, attr);
-    } else if (attrName == onloadAttr) {
+    else if (attrName == onloadAttr)
         setHTMLEventListener(loadEvent, attr);
-    } else if (attrName == compositeAttr) {
-        _compositeOperator = attr->value().deprecatedString();
-    else if (attrName == nameAttr) {
+    else if (attrName == compositeAttr)
+        _compositeOperator = attr->value().domString();
+    else if (attrName == nameAttr) {
         String newNameAttr = attr->value();
         if (inDocument() && getDocument()->isHTMLDocument()) {
             HTMLDocument* doc = static_cast<HTMLDocument*>(getDocument());
index bb91e5c049f263c8f3b04bd4188461dbdf219b5d..a0ec83ccace0f525b680ce819a8ac571fd96d100 100644 (file)
@@ -95,7 +95,7 @@ public:
     
     virtual bool isURLAttribute(Attribute*) const;
 
-    Image::CompositeOperator compositeOperator() const { return Image::compositeOperatorFromString(_compositeOperator.ascii()); }
+    Image::CompositeOperator compositeOperator() const { return Image::compositeOperatorFromString(_compositeOperator); }
 
     CachedImage* cachedImage() const { return m_imageLoader.image(); }
     
@@ -144,7 +144,7 @@ protected:
     bool ismap;
     HTMLFormElement* m_form;
     String oldNameAttr;
-    DeprecatedString _compositeOperator;
+    String _compositeOperator;
 };
 
 //------------------------------------------------------------------
index 7885125542d851a5d432c10a27e33e53d4e690b8..a79e8db2d27e9e696b00a0c8862e39ffcf53f239 100644 (file)
@@ -160,11 +160,9 @@ bool HTMLAppletElement::rendererIsNeeded(RenderStyle *style)
 
 RenderObject *HTMLAppletElement::createRenderer(RenderArena *arena, RenderStyle *style)
 {
-#ifndef Q_WS_QWS // FIXME(E)? I don't think this is possible with Qt Embedded...
     Frame *frame = getDocument()->frame();
 
-    if( frame && frame->javaEnabled() )
-    {
+    if (frame && frame->javaEnabled()) {
         HashMap<String, String> args;
 
         args.set("code", getAttribute(codeAttr));
@@ -192,9 +190,6 @@ RenderObject *HTMLAppletElement::createRenderer(RenderArena *arena, RenderStyle
     // ### remove me. we should never show an empty applet, instead
     // render the alternative content given by the webpage
     return new (getDocument()->renderArena()) RenderEmptyApplet(this);
-#else
-    return 0;
-#endif
 }
 
 #if __APPLE__
index 0c91ac8e91404dd0453ca34788149634329d19ac..5c2c8e18722c0be352e5c00166d68f69cb44f5ae 100644 (file)
@@ -40,14 +40,11 @@ SVGStringList::~SVGStringList()
 void SVGStringList::reset(const DeprecatedString &str)
 {
     DeprecatedStringList list = DeprecatedStringList::split(' ', str);
-    if(list.count() == 0)
-    {
+    if (list.count() == 0) {
         StringImpl *item = new StringImpl(str);
         item->ref();
         appendItem(item);
-    }
-    else for(DeprecatedStringList::Iterator it = list.begin(); it != list.end(); ++it)
-    {
+    } else for(DeprecatedStringList::Iterator it = list.begin(); it != list.end(); ++it) {
         StringImpl *item = new StringImpl((*it));
         item->ref();
         appendItem(item);
index be1d53ac37e0e6491ef2cf4f1caef1a7f641335c..9697bddae66cc2a33e3ed93a6d962201f043da87 100644 (file)
@@ -37,8 +37,6 @@ class WebCoreAXObject;
 class WebCoreTextMarker;
 #endif
 
-class DeprecatedString;
-
 namespace WebCore {
     class RenderObject;
     class VisiblePosition;
@@ -66,8 +64,8 @@ public:
     
     void childrenChanged(WebCore::RenderObject* renderer);
 
-    void postNotification(WebCore::RenderObject* renderer, const DeprecatedString& msg);
-    void postNotificationToTopWebArea(WebCore::RenderObject* renderer, const DeprecatedString& msg);
+    void postNotification(WebCore::RenderObject* renderer, const WebCore::String& msg);
+    void postNotificationToTopWebArea(WebCore::RenderObject* renderer, const WebCore::String& msg);
     void handleFocusedUIElementChanged(void);
     
     static void enableAccessibility() { gAccessibilityEnabled = true; }
index 60618fd8c6095e55d68662669bd5d4c6548036dd..4191a5f27899cd436d505a8116fdd4c33b25de08 100644 (file)
 #import "WebCoreAXObject.h"
 #import <kxmlcore/Assertions.h>
 #import "FoundationExtras.h"
-#import "DeprecatedString.h"
 #import "RenderObject.h"
 #import "WebCoreViewFactory.h"
 #import "Document.h"
 
-using WebCore::EAffinity;
-using WebCore::RenderObject;
-using WebCore::VisiblePosition;
+using namespace WebCore;
 
 // The simple Cocoa calls in this file don't throw exceptions.
 
@@ -44,7 +41,7 @@ bool AccessibilityObjectCache::gAccessibilityEnabled = false;
 
 typedef struct KWQTextMarkerData  {
     WebCoreAXID  axObjectID;
-    WebCore::Node*  nodeImpl;
+    Node*  nodeImpl;
     int             offset;
     EAffinity       affinity;
 };
@@ -159,14 +156,14 @@ void AccessibilityObjectCache::removeAXObjectID(WebCoreAXObject* accObject)
 
 WebCoreTextMarker *AccessibilityObjectCache::textMarkerForVisiblePosition (const VisiblePosition &visiblePos)
 {
-    WebCore::Position deepPos = visiblePos.deepEquivalent();
-    WebCore::Node* domNode = deepPos.node();
+    Position deepPos = visiblePos.deepEquivalent();
+    Node* domNode = deepPos.node();
     ASSERT(domNode != NULL);
     if (domNode == NULL)
         return nil;
     
     // locate the renderer, which must exist for a visible dom node
-    WebCore::RenderObject* renderer = domNode->renderer();
+    RenderObject* renderer = domNode->renderer();
     ASSERT(renderer != NULL);
     
     // find or create an accessibility object for this renderer
@@ -213,18 +210,18 @@ void AccessibilityObjectCache::childrenChanged(RenderObject* renderer)
     [obj childrenChanged];
 }
 
-void AccessibilityObjectCache::postNotificationToTopWebArea(RenderObject* renderer, const DeprecatedString& msg)
+void AccessibilityObjectCache::postNotificationToTopWebArea(RenderObject* renderer, const String& msg)
 {
     if (renderer) {
         RenderObject * obj = renderer->document()->topDocument()->renderer();
-        NSAccessibilityPostNotification(accObject(obj), msg.getNSString());
+        NSAccessibilityPostNotification(accObject(obj), msg);
     }
 }
 
-void AccessibilityObjectCache::postNotification(RenderObject* renderer, const DeprecatedString& msg)
+void AccessibilityObjectCache::postNotification(RenderObject* renderer, const String& msg)
 {
     if (renderer)
-        NSAccessibilityPostNotification(accObject(renderer), msg.getNSString());
+        NSAccessibilityPostNotification(accObject(renderer), msg);
 }
 
 void AccessibilityObjectCache::handleFocusedUIElementChanged()
index d2a456ca091235ac19bee383cc80af33d5fabf9a..22f238659e81f14f1025c3bf9d9622d717c44edf 100644 (file)
@@ -74,21 +74,17 @@ static NSString *cocoaTypeFromMIMEType(const String &type)
     DeprecatedString qType = type.deprecatedString().stripWhiteSpace();
 
     // two special cases for IE compatibility
-    if (qType == "Text") {
+    if (qType == "Text")
         return NSStringPboardType;
-    }
-    if (qType == "URL") {
+    if (qType == "URL")
         return NSURLPboardType;
-    } 
 
     // Ignore any trailing charset - JS strings are Unicode, which encapsulates the charset issue
-    if (qType == "text/plain" || qType.startsWith("text/plain;")) {
+    if (qType == "text/plain" || qType.startsWith("text/plain;"))
         return NSStringPboardType;
-    }
-    if (qType == "text/uri-list") {
+    if (qType == "text/uri-list")
         // special case because UTI doesn't work with Cocoa's URL type
         return NSURLPboardType; // note special case in getData to read NSFilenamesType
-    }
     
     // Try UTI now
     NSString *mimeType = qType.getNSString();
@@ -96,9 +92,8 @@ static NSString *cocoaTypeFromMIMEType(const String &type)
     if (UTIType) {
         CFStringRef pbType = UTTypeCopyPreferredTagWithClass(UTIType, kUTTagClassNSPboardType);
         CFRelease(UTIType);
-        if (pbType) {
+        if (pbType)
             return KWQCFAutorelease(pbType);
-        }
     }
 
    // No mapping, just pass the whole string though
index fd4a879357b059a852645f9bd098e396c7d922f1..c7f00e49deeccfe122f33203b0d2be9cd3818887 100644 (file)
@@ -28,6 +28,7 @@
 
 #include "PlatformString.h"
 #include "Font.h"
+#include "KURL.h"
 
 class KHTMLSettings
 {
@@ -59,7 +60,7 @@ public:
     
     const DeprecatedString& encoding() const { return m_encoding; }
 
-    DeprecatedString userStyleSheet() const { return m_userStyleSheetLocation; }
+    KURL userStyleSheetLocation() const { return m_userStyleSheetLocation; }
     bool shouldPrintBackgrounds() const { return m_shouldPrintBackgrounds; }
     bool textAreasAreResizable() const { return m_textAreasAreResizable; }
 
@@ -83,7 +84,7 @@ public:
 
     void setEncoding(const DeprecatedString& s) { m_encoding = s; }
 
-    void setUserStyleSheet(const DeprecatedString& s) { m_userStyleSheetLocation = s; }
+    void setUserStyleSheetLocation(const KURL& s) { m_userStyleSheetLocation = s; }
     void setShouldPrintBackgrounds(bool f) { m_shouldPrintBackgrounds = f; }
     void setTextAreasAreResizable(bool f) { m_textAreasAreResizable = f; }
     
@@ -95,7 +96,7 @@ private:
     WebCore::AtomicString m_cursiveFontName;
     WebCore::AtomicString m_fantasyFontName;
     DeprecatedString m_encoding; // FIXME: TextEncoding takes a latin1 string, which String & AtomicString don't easily produce
-    DeprecatedString m_userStyleSheetLocation; // FIXME: KURLs still use DeprecatedString
+    KURL m_userStyleSheetLocation;
     
     int m_minimumFontSize;
     int m_minimumLogicalFontSize;
index e68d45bec057bdc0541d7df0f3e600d7ba249df1..4eba5b310a3b979895b7836aa07cda6a67927b2d 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QLINEEDIT_H_
-#define QLINEEDIT_H_
+#ifndef QLineEdit_H
+#define QLineEdit_H
 
 #include "PlatformString.h"
-#include "DeprecatedString.h"
 #include "TextDirection.h"
 #include "Widget.h"
 
@@ -76,7 +75,7 @@ public:
     bool hasSelectedText() const;
     
     int selectionStart() const;
-    DeprecatedString selectedText() const;
+    WebCore::String selectedText() const;
     void setSelection(int, int);
     
     IntSize sizeForCharacterWidth(int numCharacters) const;
index d93877e274fde07fd965aa5e6de1825d5a1e57fc..9cf49369c7557c07934d9ff7710319ed04ab1f66 100644 (file)
@@ -210,14 +210,14 @@ int QLineEdit::selectionStart() const
     return -1;
 }
 
-DeprecatedString QLineEdit::selectedText() const
+String QLineEdit::selectedText() const
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     NSRange range = [m_controller selectedRange];
     NSString *str = [m_controller string];
-    return DeprecatedString::fromNSString([str substringWithRange:range]);
+    return [str substringWithRange:range];
     END_BLOCK_OBJC_EXCEPTIONS;
-    return DeprecatedString();
+    return String();
 }
 
 void QLineEdit::setSelection(int start, int length)
index baf40aa6a571cef780ba0b39ea06cfb6063c5699..b573851450f72091868ea767f6ceb22836819749 100644 (file)
@@ -67,7 +67,8 @@ void CachedCSSStyleSheet::ref(CachedObjectClient *c)
 {
     CachedObject::ref(c);
 
-    if(!m_loading) c->setStyleSheet( m_url, m_sheet );
+    if (!m_loading)
+        c->setStyleSheet(m_url, m_sheet);
 }
 
 void CachedCSSStyleSheet::deref(CachedObjectClient *c)
index 37356c41ee2a1fdff184f1e5c38ae85c89782de5..09668929c84620e4099c77e964e4659751f8e4a6 100644 (file)
@@ -120,7 +120,7 @@ public:
         m_cachedSheet->deref(this);
     }
 private:
-    virtual void setStyleSheet(const String&, const String& sheet)
+    virtual void setStyleSheet(const String& /*URL*/, const String& sheet)
     {
         m_frame->setUserStyleSheet(sheet.deprecatedString());
     }
@@ -345,17 +345,7 @@ void Frame::setView(FrameView* view)
 
 bool Frame::jScriptEnabled() const
 {
-  return d->m_bJScriptEnabled;
-}
-
-void Frame::setMetaRefreshEnabled(bool enable)
-{
-  d->m_metaRefreshEnabled = enable;
-}
-
-bool Frame::metaRefreshEnabled() const
-{
-  return d->m_metaRefreshEnabled;
+    return d->m_bJScriptEnabled;
 }
 
 KJSProxy *Frame::jScript()
@@ -416,16 +406,12 @@ JSValue* Frame::executeScript(Node* n, const DeprecatedString& script, bool forc
 
 bool Frame::javaEnabled() const
 {
-#ifndef Q_WS_QWS
-  return d->m_bJavaEnabled;
-#else
-  return false;
-#endif
+    return d->m_settings->isJavaEnabled();
 }
 
 bool Frame::pluginsEnabled() const
 {
-  return d->m_bPluginsEnabled;
+    return d->m_bPluginsEnabled;
 }
 
 void Frame::setAutoloadImages(bool enable)
@@ -516,7 +502,7 @@ void Frame::receivedFirstData()
 
     // Support for http-refresh
     qData = d->m_job->queryMetaData("http-refresh").deprecatedString();
-    if (!qData.isEmpty() && d->m_metaRefreshEnabled) {
+    if (!qData.isEmpty()) {
       double delay;
       int pos = qData.find(';');
       if (pos == -1)
@@ -632,7 +618,7 @@ void Frame::begin(const KURL& url)
   updatePolicyBaseURL();
 
   setAutoloadImages(d->m_settings->autoLoadImages());
-  String userStyleSheet = d->m_settings->userStyleSheet();
+  const KURL& userStyleSheet = d->m_settings->userStyleSheetLocation();
 
   if (!userStyleSheet.isEmpty())
     setUserStyleSheetLocation(KURL(userStyleSheet));
@@ -1037,7 +1023,7 @@ void Frame::setUserStyleSheetLocation(const KURL& url)
         d->m_userStyleSheetLoader = new UserStyleSheetLoader(this, url.url(), d->m_doc->docLoader());
 }
 
-void Frame::setUserStyleSheet(const DeprecatedString& styleSheet)
+void Frame::setUserStyleSheet(const String& styleSheet)
 {
     delete d->m_userStyleSheetLoader;
     d->m_userStyleSheetLoader = 0;
@@ -1374,7 +1360,7 @@ bool Frame::requestFrame(RenderPart* renderer, const String& urlParam, const Ato
 }
 
 bool Frame::requestObject(RenderPart* renderer, const String& url, const AtomicString& frameName,
-                          const String& mimeType, const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues)
+                          const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues)
 {
     KURL completedURL;
     if (!url.isEmpty())
@@ -1406,7 +1392,7 @@ bool Frame::shouldUsePlugin(Node* element, const KURL& url, const String& mimeTy
 
 
 bool Frame::loadPlugin(RenderPart *renderer, const KURL& url, const String& mimeType, 
-                       const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues, bool useFallback)
+                       const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback)
 {
     if (useFallback) {
         checkEmitLoadEvent();
@@ -1633,31 +1619,29 @@ String Frame::jsDefaultStatusBarText() const
 
 DeprecatedString Frame::referrer() const
 {
-   return d->m_referrer;
+    return d->m_referrer;
 }
 
 String Frame::lastModified() const
 {
-  return d->m_lastModified;
+    return d->m_lastModified;
 }
 
 void Frame::reparseConfiguration()
 {
-  setAutoloadImages(d->m_settings->autoLoadImages());
-  if (d->m_doc)
-     d->m_doc->docLoader()->setShowAnimations(KHTMLSettings::KAnimationEnabled);
-
-  d->m_bJScriptEnabled = d->m_settings->isJavaScriptEnabled();
-  d->m_bJavaEnabled = d->m_settings->isJavaEnabled();
-  d->m_bPluginsEnabled = d->m_settings->isPluginsEnabled();
-
-  DeprecatedString userStyleSheet = d->m_settings->userStyleSheet();
-  if (!userStyleSheet.isEmpty())
-    setUserStyleSheetLocation(KURL(userStyleSheet));
-  else
-    setUserStyleSheet(DeprecatedString());
+    setAutoloadImages(d->m_settings->autoLoadImages());
+    if (d->m_doc)
+        d->m_doc->docLoader()->setShowAnimations(KHTMLSettings::KAnimationEnabled);
+        
+    d->m_bJScriptEnabled = d->m_settings->isJavaScriptEnabled();
+    d->m_bJavaEnabled = d->m_settings->isJavaEnabled();
+    d->m_bPluginsEnabled = d->m_settings->isPluginsEnabled();
 
-  if (d->m_doc) d->m_doc->updateStyleSelector();
+    const KURL& userStyleSheetLocation = d->m_settings->userStyleSheetLocation();
+    if (!userStyleSheetLocation.isEmpty())
+        setUserStyleSheetLocation(userStyleSheetLocation);
+    else
+        setUserStyleSheet(String());
 }
 
 bool Frame::shouldDragAutoNode(Node *node, int x, int y) const
@@ -1796,15 +1780,13 @@ void Frame::handleMousePressEventSingleClick(const MouseEventWithHitTestResults&
                 // was created right-to-left
                 Position start = sel.start();
                 short before = Range::compareBoundaryPoints(pos.node(), pos.offset(), start.node(), start.offset());
-                if (before <= 0) {
+                if (before <= 0)
                     sel.setBaseAndExtent(pos.node(), pos.offset(), sel.end().node(), sel.end().offset());
-                } else {
+                else
                     sel.setBaseAndExtent(start.node(), start.offset(), pos.node(), pos.offset());
-                }
 
-                if (d->m_selectionGranularity != CharacterGranularity) {
+                if (d->m_selectionGranularity != CharacterGranularity)
                     sel.expandUsingGranularity(d->m_selectionGranularity);
-                }
                 d->m_beganSelectingText = true;
             } else {
                 sel = SelectionController(visiblePos);
@@ -1974,9 +1956,8 @@ void dispatchEditableContentChangedEvent(Node* root)
 void Frame::appliedEditing(EditCommandPtr& cmd)
 {
     SelectionController sel(cmd.endingSelection());
-    if (shouldChangeSelection(sel)) {
+    if (shouldChangeSelection(sel))
         setSelection(sel, false);
-    }
     
     dispatchEditableContentChangedEvent(!selection().isNone() ? selection().start().node()->rootEditableElement() : 0);
 
@@ -2007,9 +1988,8 @@ void Frame::appliedEditing(EditCommandPtr& cmd)
 void Frame::unappliedEditing(EditCommandPtr& cmd)
 {
     SelectionController sel(cmd.startingSelection());
-    if (shouldChangeSelection(sel)) {
+    if (shouldChangeSelection(sel))
         setSelection(sel, true);
-    }
     
     dispatchEditableContentChangedEvent(!selection().isNone() ? selection().start().node()->rootEditableElement() : 0);
         
@@ -2021,9 +2001,8 @@ void Frame::unappliedEditing(EditCommandPtr& cmd)
 void Frame::reappliedEditing(EditCommandPtr& cmd)
 {
     SelectionController sel(cmd.endingSelection());
-    if (shouldChangeSelection(sel)) {
+    if (shouldChangeSelection(sel))
         setSelection(sel, true);
-    }
     
     dispatchEditableContentChangedEvent(!selection().isNone() ? selection().start().node()->rootEditableElement() : 0);
         
index f5d4b5e1d174abd1bc706374c932e396e95779dc..b6d2b60d2e2a3524615be05d2149503816b39255 100644 (file)
@@ -41,6 +41,7 @@
 #include <qscrollbar.h>
 #include <DeprecatedStringList.h>
 #include <kxmlcore/Noncopyable.h>
+#include <kxmlcore/Vector.h>
 
 class KHTMLSettings;
 
@@ -138,16 +139,6 @@ public:
    * Returns true if plugins are enabled, false otherwise.
    */
   bool pluginsEnabled() const;
-  
-  /**
-   * Enable/disable the automatic forwarding by <meta http-equiv="refresh" ....>
-   */
-  void setMetaRefreshEnabled(bool enable);
-
-  /**
-   * Returns @p true if automtaic forwarding is enabled.
-   */
-  bool metaRefreshEnabled() const;
 
   /**
    * Execute the specified snippet of JavaScript code.
@@ -269,23 +260,12 @@ public:
   DeprecatedString encoding() const;
 
   /**
-   * Sets a user defined style sheet to be used on top of the HTML 4
-   * default style sheet.
-   *
-   * This gives a wide range of possibilities to
-   * change the layout of the page.
+   * Sets a user defined style sheet to be used on top of the HTML4,
+   * SVG and printing default style sheets.
    */
   void setUserStyleSheetLocation(const KURL& url);
-
-  /**
-   * Sets a user defined style sheet to be used on top of the HTML 4
-   * default style sheet.
-   *
-   * This gives a wide range of possibilities to
-   * change the layout of the page.
-   */
-  void setUserStyleSheet(const DeprecatedString& styleSheet);
-
+  void setUserStyleSheet(const String& styleSheetData);
+  
   /**
    * Sets the standard font style.
    *
@@ -596,7 +576,7 @@ public:
   virtual bool lastEventIsMouseUp() const = 0;
   virtual String overrideMediaType() const = 0;
 protected:
-  virtual Plugin* createPlugin(const KURL& url, const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues, const String& mimeType) = 0;
+  virtual Plugin* createPlugin(const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType) = 0;
   virtual Frame* createFrame(const KURL& url, const String& name, RenderPart* renderer, const String& referrer) = 0;
   virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType) = 0;
 
@@ -642,7 +622,7 @@ private:
 
   bool shouldUsePlugin(Node* element, const KURL& url, const String& mimeType, bool hasFallback, bool& useFallback);
   bool loadPlugin(RenderPart* renderer, const KURL& url, const String& mimeType, 
-                  const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues, bool useFallback);
+                  const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback);
   Frame* loadSubframe(RenderPart* renderer, const KURL& url, const String& name, const String& referrer);
 
 public:
@@ -651,7 +631,7 @@ public:
                   const String& boundary = String());
   
   bool requestObject(RenderPart* frame, const String& url, const AtomicString& frameName,
-                     const String& serviceType, const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues);
+                     const String& serviceType, const Vector<String>& paramNames, const Vector<String>& paramValues);
   bool requestFrame(RenderPart* frame, const String& url, const AtomicString& frameName);
 
   Document* document() const;
index 7a08ad7ff2971df0a810d35e209d1bb017d4d914..89613875b1f85e151fd27c73ab4105c655e17171 100644 (file)
@@ -62,7 +62,6 @@ namespace WebCore {
             , m_bJScriptEnabled(true)
             , m_bJavaEnabled(true)
             , m_bPluginsEnabled(true)
-            , m_metaRefreshEnabled(true)
             , m_settings(0)
             , m_job(0)
             , m_bComplete(true)
@@ -128,7 +127,6 @@ namespace WebCore {
         bool m_bJScriptEnabled : 1;
         bool m_bJavaEnabled : 1;
         bool m_bPluginsEnabled : 1;
-        bool m_metaRefreshEnabled : 1;
 
         KHTMLSettings* m_settings;
 
index 06117ac70647e40747b0d1068b89731a291166bc..e7fd836194d683f71489fac2f06ecbd8789654d2 100644 (file)
@@ -33,6 +33,7 @@ public:
     static void init();
     
     AtomicString() { }
+    AtomicString(QChar c) : m_string(add(&c, 1)) { }
     AtomicString(const char* s) : m_string(add(s)) { }
     AtomicString(const QChar* s, int length) : m_string(add(s, length)) { }
     AtomicString(const unsigned short* s, int length) : m_string(add((QChar*)s, length)) { }
index 253feb4e219628639efd2b2f41f2500019ec4ed9..fa2c9615a3b6457e1580851854166f2e39179ad6 100644 (file)
@@ -2176,7 +2176,7 @@ DeprecatedString &DeprecatedString::remove(unsigned index, unsigned len)
     return *this;
 }
 
-DeprecatedString &DeprecatedString::replace( unsigned index, unsigned len, const DeprecatedString &str )
+DeprecatedString &DeprecatedString::replace(unsigned index, unsigned len, const DeprecatedString& str)
 {
     return remove(index, len).insert(index, str);
 }
@@ -2192,7 +2192,6 @@ DeprecatedString &DeprecatedString::replace(char pattern, const DeprecatedString
     return *this;
 }
 
-
 DeprecatedString &DeprecatedString::replace(QChar pattern, const DeprecatedString &str)
 {
     int slen = str.dataHandle[0]->_length;
@@ -2204,7 +2203,6 @@ DeprecatedString &DeprecatedString::replace(QChar pattern, const DeprecatedStrin
     return *this;
 }
 
-
 DeprecatedString &DeprecatedString::replace(const DeprecatedString &pattern, const DeprecatedString &str)
 {
     if (pattern.isEmpty())
index d7ef1dc2c6bf769bf068c686ddd2de7387e16513..4840d4b95b22f47c28d32cfe283c73728a99f8f7 100644 (file)
@@ -159,7 +159,7 @@ namespace WebCore {
 #if __APPLE__
         static CGContextRef currentCGContext();
         static int getCompositeOperation(CGContextRef);
-        static void setCompositeOperation(CGContextRef, const DeprecatedString& operation);
+        static void setCompositeOperation(CGContextRef, const String& operation);
         static void setCompositeOperation(CGContextRef, int operation);
 #endif
 
index 5e074c2177fb3cb178e104a1b35d6c25c90173bf..ea0fced02776babc9c0a62816e8404d7884c24dc 100644 (file)
@@ -31,8 +31,6 @@
 #include "DeprecatedArray.h"
 #include "IntSize.h"
 
-class DeprecatedString;
-
 #if __APPLE__
 #include <ApplicationServices/ApplicationServices.h>
 #if __OBJC__
index 90aae8a3d4b24e215fa65442d0c19ab9033ceb95..61c664e0dd3f3638f2905c3439f2911128952b4f 100644 (file)
@@ -259,23 +259,6 @@ KURL::KURL(const DeprecatedString &url)
         parse(url.ascii(), &url);
 }
 
-KURL::KURL(const String& stringURL)
-{
-    DeprecatedString url = stringURL.deprecatedString();
-    if (!url.isEmpty() && url[0] == '/') {
-        // 5 for "file:", 1 for terminator
-        Vector<char, 2048> buffer(url.length() + 6);
-        buffer[0] = 'f';
-        buffer[1] = 'i';
-        buffer[2] = 'l';
-        buffer[3] = 'e';
-        buffer[4] = ':';
-        url.copyLatin1(&buffer[5]);
-        parse(buffer, 0);
-    } else
-        parse(url.ascii(), &url);
-}
-
 KURL::KURL(const KURL &base, const DeprecatedString &relative, const WebCore::TextEncoding& encoding)
 {
     // Allow at lest absolute URLs to resolve against an empty URL.
index 782eb96481f25fd8379e321531627ebc64703c82..3bdcc0c3b2791a8afe84590b6764e8a02805024b 100644 (file)
@@ -49,7 +49,6 @@ public:
     KURL(const char*);
     KURL(const KURL&, const DeprecatedString&, const WebCore::TextEncoding& encoding = WebCore::TextEncoding(WebCore::UTF8Encoding));
     KURL(const DeprecatedString&);
-    KURL(const WebCore::String&);
 #if __APPLE__
     KURL(NSURL*);
 #endif
index 0517f9727d5661a68885345936429d3344e8ffe4..f59a70ee06473738787c7553ecfbb6f0a1fe99ed 100644 (file)
@@ -43,6 +43,7 @@ namespace WebCore {
 class String {
 public:
     String() { } // gives null string, distinguishable from an empty string
+    String(QChar c) : m_impl(new StringImpl(&c, 1)) { }
     String(const QChar*, unsigned length);
     String(const DeprecatedString&);
     String(const KJS::Identifier&);
@@ -76,6 +77,7 @@ public:
         { return m_impl ? m_impl->endsWith(s.impl(), caseSensitive) : s.isEmpty(); }
 
     String& replace(QChar a, QChar b) { if (m_impl) m_impl = m_impl->replace(a, b); return *this; }
+    String& replace(QChar a, const String& b) { if (m_impl) m_impl = m_impl->replace(a, b.impl()); return *this; }
 
     unsigned length() const;
     void truncate(unsigned len);
@@ -126,6 +128,12 @@ private:
 };
 
 String operator+(const String&, const String&);
+String operator+(const String&, const char*);
+String operator+(const char*, const String&);
+String operator+(const String&, QChar);
+String operator+(QChar, const String&);
+String operator+(const String&, char);
+String operator+(char, const String&);
 
 inline bool operator==(const String& a, const String& b) { return equal(a.impl(), b.impl()); }
 inline bool operator==(const String& a, const char* b) { return equal(a.impl(), b); }
index d4d88a8f2967ada093d606e58c8c3972e9a6d5ef..26d319b708403cb67a88265f28d86b9601b9368a 100644 (file)
@@ -88,6 +88,36 @@ String operator+(const String& a, const String& b)
     return c;
 }
 
+String operator+(const String& s, const char* cs)
+{
+    return s + String(cs);
+}
+
+String operator+(const char* cs, const String& s)
+{
+    return String(cs) + s;
+}
+
+String operator+(const String& s, QChar c)
+{
+    return s + String(c);
+}
+
+String operator+(QChar c, const String& s)
+{
+    return String(c) + s;
+}
+
+String operator+(const String& s, char c)
+{
+    return s + String(c);
+}
+
+String operator+(char c, const String& s)
+{
+    return String(c) + s;
+}
+
 void String::insert(const String& str, unsigned pos)
 {
     if (!m_impl)
index 77e0a54c14a0512ec273c787b9e52fe34b608d31..1e1972145020329c2cb2a3e03e910414553f6dea 100644 (file)
@@ -164,10 +164,12 @@ void StringImpl::truncate(int len)
 void StringImpl::remove(unsigned pos, int len)
 {
     assert(!_inTable);
-    if(len <= 0) return;
-    if(pos >= l ) return;
-    if((unsigned)len > l - pos)
-    len = l - pos;
+    if (len <= 0)
+        return;
+    if (pos >= l )
+        return;
+    if ((unsigned)len > l - pos)
+        len = l - pos;
 
     unsigned newLen = l-len;
     QChar* c = newQCharVector(newLen);
@@ -248,9 +250,9 @@ static Length parseLength(const QChar* s, unsigned int l)
         ++i;
 
     if (ok) {
-        if (i == l) {
+        if (i == l)
             return Length(r, Fixed);
-        else {
+        else {
             const QChar* next = s+i;
 
             if (*next == '%')
@@ -638,6 +640,26 @@ StringImpl* StringImpl::replace(QChar oldC, QChar newC)
     return c;
 }
 
+StringImpl* StringImpl::replace(unsigned index, unsigned len, const StringImpl* str)
+{
+    StringImpl* s = copy();
+    s->remove(index, len);
+    s->insert(str, index);
+    return s;
+}
+
+StringImpl* StringImpl::replace(QChar pattern, const StringImpl* str)
+{
+    int slen = str ? str->length() : 0;
+    int index = 0;
+    StringImpl* result = this;
+    while ((index = result->find(pattern, index)) >= 0) {
+        result = result->replace(index, 1, str);
+        index += slen;
+    }
+    return result;
+}
+
 bool equal(const StringImpl* a, const StringImpl* b)
 {
     return StrHash<StringImpl*>::equal(a, b);
index 9075bf276b5a25287badece28630b32d9791ba72..854991dceab672e0641c138065df7dc8c3afa36f 100644 (file)
@@ -72,6 +72,7 @@ public:
     void insert(const StringImpl*, unsigned pos);
     void truncate(int len);
     void remove(unsigned pos, int len = 1);
+    
     StringImpl* split(unsigned pos);
     StringImpl* copy() const { return new StringImpl(s, l); }
 
@@ -101,8 +102,10 @@ public:
     bool startsWith(const StringImpl* s, bool caseSensitive = true) const { return find(s, 0, caseSensitive) == 0; }
     bool endsWith(const StringImpl*, bool caseSensitive = true) const;
 
-    // This modifies the string in place if there is only one ref, makes a new string otherwise.
+    // Does not modify the string.
     StringImpl* replace(QChar, QChar);
+    StringImpl* replace(QChar a, const StringImpl* b);
+    StringImpl* replace(unsigned index, unsigned len, const StringImpl*);
 
     static StringImpl* empty();
 
index 0b2a27ced627abff13bbfc3599e58f539e11f682..4d66ae7e53a453788adac07a60d1b5753edbb61b 100644 (file)
@@ -356,9 +356,9 @@ int GraphicsContext::getCompositeOperation(CGContextRef context)
     return (int)[[WebCoreImageRendererFactory sharedFactory] CGCompositeOperationInContext:context];
 }
 
-void GraphicsContext::setCompositeOperation (CGContextRef context, const DeprecatedString& op)
+void GraphicsContext::setCompositeOperation (CGContextRef context, const String& op)
 {
-    [[WebCoreImageRendererFactory sharedFactory] setCGCompositeOperationFromString:op.getNSString() inContext:context];
+    [[WebCoreImageRendererFactory sharedFactory] setCGCompositeOperationFromString:op inContext:context];
 }
 
 void GraphicsContext::setCompositeOperation (CGContextRef context, int op)
index d298534ce86d5a202d91aeb692997295b955b23d..6b37f9b51d3e7930d79114e580faefa922675e36 100644 (file)
@@ -147,9 +147,8 @@ void RenderHTMLCanvas::paint(PaintInfo& i, int _tx, int _ty)
     bool isPrinting = i.p->printing();
     bool drawSelectionTint = (selectionState() != SelectionNone) && !isPrinting;
     if (i.phase == PaintActionSelection) {
-        if (selectionState() == SelectionNone) {
+        if (selectionState() == SelectionNone)
             return;
-        }
         drawSelectionTint = false;
     }
 
index b567b926d6b0286b99bef659b4f1cef8b920895e..0f502b483ae5308be24b5cda8de76a8bc8f1498d 100644 (file)
@@ -689,9 +689,8 @@ void RenderSelect::updateFromElement()
                     static_cast<QComboBox*>(m_widget)->appendItem(itemText, groupEnabled && optionElement->isEnabled());
             }
             else if (listItems[listIndex]->hasTagName(hrTag)) {
-                if (!m_useListBox) {
+                if (!m_useListBox)
                     static_cast<QComboBox*>(m_widget)->appendSeparator();
-                }
             }
             else
                 KHTMLAssert(false);
index d526b759054fee9a1419bbf11399f6e86997f175..d35bcdcc1855dcc6405645caa4ed37d291c8d9aa 100644 (file)
@@ -677,9 +677,9 @@ RenderPartObject::RenderPartObject(HTMLElement* element)
     m_hasFallbackContent = false;
 }
 
-static bool isURLAllowed(WebCore::Document *doc, const DeprecatedString &url)
+static bool isURLAllowed(WebCore::Document *doc, const String &url)
 {
-    KURL newURL(doc->completeURL(url));
+    KURL newURL(doc->completeURL(url.deprecatedString()));
     newURL.setRef(DeprecatedString::null);
     
     if (doc->frame()->page()->frameCount() >= 200)
@@ -700,7 +700,7 @@ static bool isURLAllowed(WebCore::Document *doc, const DeprecatedString &url)
     return true;
 }
 
-static inline void mapClassIdToServiceType(const DeprecatedString &classId, DeprecatedString &serviceType)
+static inline void mapClassIdToServiceType(const String& classId, String& serviceType)
 {
     // It is ActiveX, but the nsplugin system handling
     // should also work, that's why we don't override the
@@ -726,10 +726,10 @@ static inline void mapClassIdToServiceType(const DeprecatedString &classId, Depr
 
 void RenderPartObject::updateWidget()
 {
-  DeprecatedString url;
-  DeprecatedString serviceType;
-  DeprecatedStringList paramNames;
-  DeprecatedStringList paramValues;
+  String url;
+  String serviceType;
+  Vector<String> paramNames;
+  Vector<String> paramValues;
   Frame *frame = m_view->frame();
 
   setNeedsLayoutAndMinMaxRecalc();
@@ -746,11 +746,10 @@ void RenderPartObject::updateWidget()
           if (child->hasTagName(embedTag)) {
               embed = static_cast<HTMLEmbedElement *>( child );
               break;
-          } else if (child->hasTagName(objectTag)) {
+          } else if (child->hasTagName(objectTag))
               child = child->nextSibling();         // Don't descend into nested OBJECT tags
-          } else {
+          else
               child = child->traverseNextNode(o);   // Otherwise descend (EMBEDs may be inside COMMENT tags)
-          }
       }
       
       // Use the attributes from the EMBED tag instead of the OBJECT tag including WIDTH and HEIGHT.
@@ -758,26 +757,21 @@ void RenderPartObject::updateWidget()
       if (embed) {
           embedOrObject = (HTMLElement *)embed;
           String attribute = embedOrObject->getAttribute(widthAttr);
-          if (!attribute.isEmpty()) {
+          if (!attribute.isEmpty())
               o->setAttribute(widthAttr, attribute);
-          }
           attribute = embedOrObject->getAttribute(heightAttr);
-          if (!attribute.isEmpty()) {
+          if (!attribute.isEmpty())
               o->setAttribute(heightAttr, attribute);
-          }
           url = embed->url;
           serviceType = embed->serviceType;
-      } else {
+      } else
           embedOrObject = (HTMLElement *)o;
-      }
       
       // If there was no URL or type defined in EMBED, try the OBJECT tag.
-      if (url.isEmpty()) {
+      if (url.isEmpty())
           url = o->url;
-      }
-      if (serviceType.isEmpty()) {
+      if (serviceType.isEmpty())
           serviceType = o->serviceType;
-      }
       
       HashSet<StringImpl*, CaseInsensitiveHash> uniqueParamNames;
       
@@ -790,18 +784,17 @@ void RenderPartObject::updateWidget()
               HTMLParamElement *p = static_cast<HTMLParamElement *>(child);
               String name = p->name().lower();
               if (url.isEmpty() && (name == "src" || name == "movie" || name == "code" || name == "url"))
-                  url = p->value().deprecatedString();
+                  url = p->value();
               if (serviceType.isEmpty() && name == "type") {
-                  serviceType = p->value().deprecatedString();
-                  int pos = serviceType.find( ";" );
-                  if (pos != -1) {
+                  serviceType = p->value();
+                  int pos = serviceType.find(";");
+                  if (pos != -1)
                       serviceType = serviceType.left(pos);
-                  }
               }
               if (!embed && !name.isEmpty()) {
                   uniqueParamNames.add(p->name().impl());
-                  paramNames.append(p->name().deprecatedString());
-                  paramValues.append(p->value().deprecatedString());
+                  paramNames.append(p->name());
+                  paramValues.append(p->value());
               }
           }
           child = child->nextSibling();
@@ -825,15 +818,15 @@ void RenderPartObject::updateWidget()
               Attribute* it = attributes->attributeItem(i);
               const AtomicString& name = it->name().localName();
               if (embed || !uniqueParamNames.contains(name.impl())) {
-                  paramNames.append(name.deprecatedString());
-                  paramValues.append(it->value().deprecatedString());
+                  paramNames.append(name.domString());
+                  paramValues.append(it->value().domString());
               }
           }
       }
       
       // If we still don't have a type, try to map from a specific CLASSID to a type.
       if (serviceType.isEmpty() && !o->classId.isEmpty())
-          mapClassIdToServiceType(o->classId.deprecatedString(), serviceType);
+          mapClassIdToServiceType(o->classId, serviceType);
       
       // If no URL and type, abort.
       if (url.isEmpty() && serviceType.isEmpty())
@@ -848,7 +841,7 @@ void RenderPartObject::updateWidget()
               (child->isTextNode() && !static_cast<Text*>(child)->containsOnlyWhitespace()))
               m_hasFallbackContent = true;
       }
-      bool success = frame->requestObject(this, url, o->name().deprecatedString(), serviceType, paramNames, paramValues);
+      bool success = frame->requestObject(this, url, AtomicString(o->name()), serviceType, paramNames, paramValues);
       if (!success && m_hasFallbackContent)
           o->renderFallbackContent();
   } else if (element()->hasTagName(embedTag)) {
@@ -866,21 +859,21 @@ void RenderPartObject::updateWidget()
       if (a) {
           for (unsigned i = 0; i < a->length(); ++i) {
               Attribute* it = a->attributeItem(i);
-              paramNames.append(it->name().localName().deprecatedString());
-              paramValues.append(it->value().deprecatedString());
+              paramNames.append(it->name().localName().domString());
+              paramValues.append(it->value().domString());
           }
       }
-      frame->requestObject(this, url, o->getAttribute(nameAttr).deprecatedString(), serviceType, paramNames, paramValues);
+      frame->requestObject(this, url, o->getAttribute(nameAttr), serviceType, paramNames, paramValues);
   } else {
       assert(element()->hasTagName(iframeTag));
       HTMLIFrameElement *o = static_cast<HTMLIFrameElement *>(element());
-      url = o->m_URL.deprecatedString();
+      url = o->m_URL;
       if (!isURLAllowed(document(), url))
           return;
       if (url.isEmpty())
           url = "about:blank";
       FrameView *v = static_cast<FrameView *>(m_view);
-      v->frame()->requestFrame(this, url, o->m_name.deprecatedString());
+      v->frame()->requestFrame(this, url, o->m_name);
   }
 }
 
index 3bc6b72310b31dce1283fea7383db7879ae21eee..50e6ebb958fc7a36e41e36e18fbaa3734b6e5d13 100644 (file)
@@ -1350,10 +1350,9 @@ public:
         region.offset.bottom = b;
         region.offset.left = l;
         region.type = type;
-        if (!append) {
-            css3NonInheritedData.access()->m_dashboardRegions.clear ();
-        }
-        css3NonInheritedData.access()->m_dashboardRegions.append (region);
+        if (!append)
+            css3NonInheritedData.access()->m_dashboardRegions.clear();
+        css3NonInheritedData.access()->m_dashboardRegions.append(region);
     }
 
     void resetBorder() { resetBorderImage(); resetBorderTop(); resetBorderRight(); resetBorderBottom(); resetBorderLeft(); resetBorderRadius(); }
index d67b903864085fe6df79b70b47b4ac97affeeb1c..c72225ab69cffb2c56b4d53c35b0f585eb46b9c1 100644 (file)
@@ -103,7 +103,7 @@ static String getCharset(const String& contentTypeString)
     while (pos < length) {
         pos = contentTypeString.find("charset", pos, false);
         if (pos <= 0)
-            return DeprecatedString();
+            return String();
         
         // is what we found a beginning of a word?
         if (contentTypeString[pos-1] > ' ' && contentTypeString[pos-1] != ';') {
@@ -292,7 +292,7 @@ void XMLHttpRequest::send(const String& body)
     m_aborted = false;
 
     if (!body.isNull() && m_method.lower() != "get" && m_method.lower() != "head" && (m_url.protocol().lower() == "http" || m_url.protocol().lower() == "https")) {
-        DeprecatedString contentType = getRequestHeader("Content-Type");
+        String contentType = getRequestHeader("Content-Type");
         String charset;
         if (contentType.isEmpty())
             setRequestHeader("Content-Type", "application/xml");
@@ -368,7 +368,7 @@ void XMLHttpRequest::abort()
 
 void XMLHttpRequest::overrideMIMEType(const String& override)
 {
-    m_mimeTypeOverride = override.deprecatedString();
+    m_mimeTypeOverride = override;
 }
 
 void XMLHttpRequest::setRequestHeader(const String& name, const String& value)