Changeset 13440 in webkit


Ignore:
Timestamp:
Mar 22, 2006, 2:27:45 PM (19 years ago)
Author:
eseidel
Message:

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):
Location:
trunk/WebCore
Files:
57 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r13439 r13440  
     12006-03-22  Eric Seidel  <eseidel@apple.com>
     2
     3        Reviewed by darin.
     4
     5        Replace more DeprecatedString with String.
     6        http://bugzilla.opendarwin.org/show_bug.cgi?id=7907
     7
     8        * WebCore+SVG/kdom.h:
     9        * bindings/objc/DOMHTML.mm:
     10        (-[DOMHTMLDocument _createDocumentFragmentWithMarkupString:baseURLString:]):
     11        * bridge/BrowserExtension.h:
     12        * bridge/mac/BrowserExtensionMac.h:
     13        * bridge/mac/BrowserExtensionMac.mm:
     14        (WebCore::BrowserExtensionMac::setTypedIconURL):
     15        * bridge/mac/FrameMac.h:
     16        * bridge/mac/FrameMac.mm:
     17        (WebCore::FrameMac::searchForLabelsBeforeElement):
     18        (WebCore::nsArray):
     19        (WebCore::FrameMac::createPlugin):
     20        (WebCore::FrameMac::bindingRootObject):
     21        (WebCore::FrameMac::windowScriptObject):
     22        (WebCore::FrameMac::windowScriptNPObject):
     23        (WebCore::FrameMac::partClearedInBegin):
     24        (WebCore::FrameMac::openURLFromPageCache):
     25        * bridge/mac/WebCoreFrameBridge.mm:
     26        (-[WebCoreFrameBridge openURL:reload:contentType:refresh:lastModified:pageCache:]):
     27        (-[WebCoreFrameBridge scrollToAnchor:]):
     28        (-[WebCoreFrameBridge URLWithAttributeString:]):
     29        (-[WebCoreFrameBridge highlightAllMatchesForString:caseSensitive:]):
     30        * bridge/mac/WebCoreScriptDebugger.mm:
     31        (-[WebCoreScriptCallFrame evaluateWebScript:]):
     32        * bridge/mac/WebCoreSettings.mm:
     33        (-[WebCoreSettings _updateAllViews]):
     34        (-[WebCoreSettings setStandardFontFamily:]):
     35        (-[WebCoreSettings setMinimumFontSize:]):
     36        (-[WebCoreSettings setMinimumLogicalFontSize:]):
     37        (-[WebCoreSettings setDefaultFontSize:]):
     38        (-[WebCoreSettings setDefaultFixedFontSize:]):
     39        (-[WebCoreSettings setUserStyleSheetLocation:]):
     40        * css/CSSComputedStyleDeclaration.cpp:
     41        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
     42        * css/CSSGrammar.y:
     43        * css/css_stylesheetimpl.cpp:
     44        (WebCore::MediaList::setMediaText):
     45        * css/css_valueimpl.cpp:
     46        (WebCore::quoteStringIfNeeded):
     47        * css/cssparser.cpp:
     48        (WebCore::CSSParser::parseColor):
     49        * css/cssstyleselector.cpp:
     50        (WebCore::CSSStyleSelector::CSSStyleSelector):
     51        * css/cssstyleselector.h:
     52        * dom/Document.cpp:
     53        (WebCore::Document::resetActiveLinkColor):
     54        (WebCore::Document::nextState):
     55        (WebCore::Document::setUserStyleSheet):
     56        (WebCore::Document::processHttpEquiv):
     57        (WebCore::Document::recalcStyleSelector):
     58        * dom/Document.h:
     59        (WebCore::Document::userStyleSheet):
     60        (WebCore::Document::setPrintStyleSheet):
     61        (WebCore::Document::printStyleSheet):
     62        * editing/markup.cpp:
     63        (WebCore::createMarkup):
     64        (WebCore::createFragmentFromMarkup):
     65        (WebCore::createFragmentFromText):
     66        * editing/markup.h:
     67        * html/CanvasRenderingContext2D.cpp:
     68        (WebCore::CanvasRenderingContext2D::setGlobalCompositeOperation):
     69        * html/HTMLTokenizer.cpp:
     70        (WebCore::HTMLTokenizer::scriptHandler):
     71        * html/html_baseimpl.cpp:
     72        (WebCore::HTMLFrameElement::openURL):
     73        (WebCore::HTMLFrameElement::attach):
     74        * html/html_headimpl.cpp:
     75        (WebCore::HTMLLinkElement::process):
     76        (WebCore::HTMLLinkElement::setStyleSheet):
     77        * html/html_headimpl.h:
     78        * html/html_imageimpl.cpp:
     79        (WebCore::HTMLImageElement::parseMappedAttribute):
     80        * html/html_imageimpl.h:
     81        (WebCore::HTMLImageElement::compositeOperator):
     82        * html/html_objectimpl.cpp:
     83        (WebCore::HTMLAppletElement::createRenderer):
     84        * ksvg2/svg/SVGStringList.cpp:
     85        (SVGStringList::reset):
     86        * kwq/AccessibilityObjectCache.h:
     87        * kwq/AccessibilityObjectCache.mm:
     88        (AccessibilityObjectCache::textMarkerForVisiblePosition):
     89        (AccessibilityObjectCache::postNotificationToTopWebArea):
     90        (AccessibilityObjectCache::postNotification):
     91        * kwq/ClipboardMac.mm:
     92        (WebCore::cocoaTypeFromMIMEType):
     93        * kwq/KWQKHTMLSettings.h:
     94        (KHTMLSettings::userStyleSheetLocation):
     95        (KHTMLSettings::setUserStyleSheetLocation):
     96        * kwq/KWQLineEdit.h:
     97        * kwq/KWQLineEdit.mm:
     98        (QLineEdit::selectedText):
     99        * loader/CachedCSSStyleSheet.cpp:
     100        (WebCore::CachedCSSStyleSheet::ref):
     101        * page/Frame.cpp:
     102        (WebCore::UserStyleSheetLoader::setStyleSheet):
     103        (WebCore::Frame::jScriptEnabled):
     104        (WebCore::Frame::javaEnabled):
     105        (WebCore::Frame::pluginsEnabled):
     106        (WebCore::Frame::receivedFirstData):
     107        (WebCore::Frame::begin):
     108        (WebCore::Frame::setUserStyleSheet):
     109        (WebCore::Frame::requestObject):
     110        (WebCore::Frame::loadPlugin):
     111        (WebCore::Frame::referrer):
     112        (WebCore::Frame::lastModified):
     113        (WebCore::Frame::reparseConfiguration):
     114        (WebCore::Frame::handleMousePressEventSingleClick):
     115        (WebCore::Frame::appliedEditing):
     116        (WebCore::Frame::unappliedEditing):
     117        (WebCore::Frame::reappliedEditing):
     118        * page/Frame.h:
     119        * page/FramePrivate.h:
     120        (WebCore::FramePrivate::FramePrivate):
     121        * platform/AtomicString.h:
     122        (WebCore::AtomicString::AtomicString):
     123        * platform/DeprecatedString.cpp:
     124        (DeprecatedString::replace):
     125        * platform/GraphicsContext.h:
     126        * platform/Image.h:
     127        * platform/KURL.cpp:
     128        * platform/KURL.h:
     129        * platform/PlatformString.h:
     130        (WebCore::String::String):
     131        (WebCore::String::replace):
     132        * platform/String.cpp:
     133        (WebCore::operator+):
     134        * platform/StringImpl.cpp:
     135        (WebCore::StringImpl::remove):
     136        (WebCore::parseLength):
     137        (WebCore::StringImpl::replace):
     138        * platform/StringImpl.h:
     139        * platform/mac/GraphicsContextMac.mm:
     140        (WebCore::GraphicsContext::setCompositeOperation):
     141        * rendering/RenderHTMLCanvas.cpp:
     142        (WebCore::RenderHTMLCanvas::paint):
     143        * rendering/render_form.cpp:
     144        (WebCore::RenderSelect::updateFromElement):
     145        * rendering/render_frames.cpp:
     146        (WebCore::isURLAllowed):
     147        (WebCore::mapClassIdToServiceType):
     148        (WebCore::RenderPartObject::updateWidget):
     149        * rendering/render_style.h:
     150        (WebCore::RenderStyle::setDashboardRegion):
     151        * xml/xmlhttprequest.cpp:
     152        (WebCore::getCharset):
     153        (WebCore::XMLHttpRequest::send):
     154        (WebCore::XMLHttpRequest::overrideMIMEType):
     155
    11562006-03-22  Beth Dakin  <bdakin@apple.com>
    2157

  • trunk/WebCore/WebCore+SVG/kdom.h

    r13393 r13440  
    2525#define KDOM_H
    2626#if SVG_SUPPORT
    27 
    28 #include "DeprecatedString.h"
    29 #include "PlatformString.h"
    3027
    3128/**

  • trunk/WebCore/bindings/objc/DOMHTML.mm

    r13393 r13440  
    511511- (DOMDocumentFragment *)_createDocumentFragmentWithMarkupString:(NSString *)markupString baseURLString:(NSString *)baseURLString
    512512{
    513     RefPtr<DocumentFragment> fragment = createFragmentFromMarkup([self _document], DeprecatedString::fromNSString(markupString), DeprecatedString::fromNSString(baseURLString));
     513    RefPtr<DocumentFragment> fragment = createFragmentFromMarkup([self _document], markupString, baseURLString);
    514514    return [DOMDocumentFragment _documentFragmentWith:fragment.get()];
    515515}

  • trunk/WebCore/bridge/BrowserExtension.h

    r13393 r13440  
    7070   
    7171    virtual void setIconURL(const KURL&) = 0;
    72     virtual void setTypedIconURL(const KURL&, const DeprecatedString& type) = 0;
     72    virtual void setTypedIconURL(const KURL&, const String& type) = 0;
    7373   
    7474    virtual int getHistoryLength() = 0;

  • trunk/WebCore/bridge/mac/BrowserExtensionMac.h

    r13393 r13440  
    4141
    4242    virtual void setIconURL(const KURL&);
    43     virtual void setTypedIconURL(const KURL&, const DeprecatedString& type);
     43    virtual void setTypedIconURL(const KURL&, const String& type);
    4444
    4545    virtual int getHistoryLength();

  • trunk/WebCore/bridge/mac/BrowserExtensionMac.mm

    r13404 r13440  
    163163}
    164164
    165 void BrowserExtensionMac::setTypedIconURL(const KURL &url, const DeprecatedString &type)
    166 {
    167     BEGIN_BLOCK_OBJC_EXCEPTIONS;
    168     [m_frame->bridge() setIconURL:url.getNSURL() withType:type.getNSString()];
     165void BrowserExtensionMac::setTypedIconURL(const KURL &url, const String &type)
     166{
     167    BEGIN_BLOCK_OBJC_EXCEPTIONS;
     168    [m_frame->bridge() setIconURL:url.getNSURL() withType:type];
    169169    END_BLOCK_OBJC_EXCEPTIONS;
    170170}

  • trunk/WebCore/bridge/mac/FrameMac.h

    r13404 r13440  
    141141
    142142    virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
    143     virtual Plugin* createPlugin(const KURL& url, const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues, const String& mimeType);
     143    virtual Plugin* createPlugin(const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType);
    144144    virtual Frame* createFrame(const KURL& url, const String& name, RenderPart* renderer, const String& referrer);
    145145

  • trunk/WebCore/bridge/mac/FrameMac.mm

    r13426 r13440  
    332332            }
    333333            searchedCellAbove = true;
    334         } else if (n->isTextNode() && n->renderer() && n->renderer()->style()->visibility() == VISIBLE)
    335         {
     334        } else if (n->isTextNode() && n->renderer() && n->renderer()->style()->visibility() == VISIBLE) {
    336335            // For each text chunk, run the regexp
    337336            DeprecatedString nodeString = n->nodeValue().deprecatedString();
    338337            // add 100 for slop, to make it more likely that we'll search whole nodes
    339             if (lengthSearched + nodeString.length() > maxCharsSearched) {
     338            if (lengthSearched + nodeString.length() > maxCharsSearched)
    340339                nodeString = nodeString.right(charsSearchedThreshold - lengthSearched);
    341             }
    342340            int pos = regExp->searchRev(nodeString);
    343341            if (pos >= 0)
    … …  
    526524}
    527525
    528 
    529 Plugin* FrameMac::createPlugin(const KURL& url, const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues, const String& mimeType)
     526static NSArray* nsArray(const Vector<String>& vector)
     527{
     528    unsigned len = vector.size();
     529    NSMutableArray* array = [NSMutableArray arrayWithCapacity:len];
     530    for (unsigned x = 0; x < len; x++)
     531        [array addObject:vector[x]];
     532    return array;
     533}
     534
     535Plugin* FrameMac::createPlugin(const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType)
    530536{
    531537    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    532538
    533539    return new Plugin(new Widget([_bridge viewForPluginWithURL:url.getNSURL()
    534                                   attributeNames:paramNames.getNSArray()
    535                                   attributeValues:paramValues.getNSArray()
     540                                  attributeNames:nsArray(paramNames)
     541                                  attributeValues:nsArray(paramValues)
    536542                                  MIMEType:mimeType]));
    537543
    … …  
    10421048KJS::Bindings::RootObject *FrameMac::bindingRootObject()
    10431049{
    1044     assert(d->m_bJScriptEnabled);
     1050    assert(jScriptEnabled());
    10451051    if (!_bindingRoot) {
    10461052        JSLock lock;
    … …  
    10561062WebScriptObject *FrameMac::windowScriptObject()
    10571063{
    1058     if (!d->m_bJScriptEnabled)
     1064    if (!jScriptEnabled())
    10591065        return 0;
    10601066
    … …  
    10711077{
    10721078    if (!_windowScriptNPObject) {
    1073         if (d->m_bJScriptEnabled) {
     1079        if (jScriptEnabled()) {
    10741080            // JavaScript is enabled, so there is a JavaScript window object.  Return an NPObject bound to the window
    10751081            // object.
    … …  
    10891095void FrameMac::partClearedInBegin()
    10901096{
    1091     if (d->m_bJScriptEnabled)
     1097    if (jScriptEnabled())
    10921098        [_bridge windowObjectCleared];
    10931099}
    … …  
    11181124   
    11191125    // delete old status bar msg's from kjs (if it _was_ activated on last URL)
    1120     if (d->m_bJScriptEnabled) {
     1126    if (jScriptEnabled()) {
    11211127        d->m_kjsStatusBarText = String();
    11221128        d->m_kjsDefaultStatusBarText = String();

  • trunk/WebCore/bridge/mac/WebCoreFrameBridge.mm

    r13427 r13440  
    532532    request.reload = reload;
    533533    if (contentType)
    534         request.m_responseMIMEType = DeprecatedString::fromNSString(contentType);
     534        request.m_responseMIMEType = contentType;
    535535    m_frame->setResourceRequest(request);
    536536
    … …  
    539539        // things we have to set up after calling didOpenURL
    540540        if (refresh) {
    541             m_frame->addMetaData("http-refresh", DeprecatedString::fromNSString(refresh));
     541            m_frame->addMetaData("http-refresh", refresh);
    542542        }
    543543        if (lastModified) {
    544544            NSString *modifiedString = [lastModified descriptionWithCalendarFormat:@"%a %b %d %Y %H:%M:%S" timeZone:nil locale:nil];
    545             m_frame->addMetaData("modified", DeprecatedString::fromNSString(modifiedString));
     545            m_frame->addMetaData("modified", modifiedString);
    546546        }
    547547    }
    … …  
    738738}
    739739
    740 - (void)scrollToAnchor:(NSString *)a
    741 {
    742     m_frame->gotoAnchor(DeprecatedString::fromNSString(a));
     740- (void)scrollToAnchor:(NSString *)anchor
     741{
     742    m_frame->gotoAnchor(anchor);
    743743}
    744744
    … …  
    12011201{
    12021202    Document *doc = m_frame->document();
    1203     if (!doc) {
     1203    if (!doc)
    12041204        return nil;
    1205     }
    12061205    // FIXME: is parseURL appropriate here?
    1207     DeprecatedString rel = parseURL(DeprecatedString::fromNSString(string)).deprecatedString();
     1206    DeprecatedString rel = parseURL(string).deprecatedString();
    12081207    return KURL(doc->completeURL(rel)).getNSURL();
    12091208}
    … …  
    12161215- (unsigned)highlightAllMatchesForString:(NSString *)string caseSensitive:(BOOL)caseFlag
    12171216{
    1218     return m_frame->highlightAllMatchesForString(DeprecatedString::fromNSString(string), caseFlag);
     1217    return m_frame->highlightAllMatchesForString(string, caseFlag);
    12191218}
    12201219

  • trunk/WebCore/bridge/mac/WebCoreScriptDebugger.mm

    r13393 r13440  
    323323    if (state->context().imp()) {  // "eval" won't work without context (i.e. at global scope)
    324324        JSValue *v = globObj->get(state, "eval");
    325         if (v->isObject() && static_cast<JSObject *>(v)->implementsCall()) {
     325        if (v->isObject() && static_cast<JSObject *>(v)->implementsCall())
    326326            eval = static_cast<JSObject *>(v);
    327         }
    328         else {
     327        else
    329328            // no "eval" - fallback operates on global exec state
    330329            state = interp->globalExec();
    331         }
    332330    }
    333331
    … …  
    342340        args.append(jsString(code));
    343341        result = eval->call(state, NULL, args);
    344     }
    345     else {
     342    } else
    346343        // no "eval", or no context (i.e. global scope) - use global fallback
    347344        result = interp->imp()->evaluate(code.data(), code.size(), globObj, UString(), 0).value();
    348     }
    349 
    350     if (state->hadException()) {
     345
     346    if (state->hadException())
    351347        result = state->exception();    // (may be redundant depending on which eval path was used)
    352     }
    353348    state->setException(savedException);
    354349

  • trunk/WebCore/bridge/mac/WebCoreSettings.mm

    r13432 r13440  
    7070    for (DeprecatedPtrListIterator<Frame> it(Frame::instances()); it.current(); ++it) {
    7171        FrameMac *frame = Mac(it.current());
    72         if (frame->settings() == settings) {
     72        if (frame->settings() == settings)
    7373            [frame->bridge() setNeedsReapplyStyles];
    74         }
    7574    }
    7675}
    … …  
    7877- (void)setStandardFontFamily:(NSString *)s
    7978{
    80     if ([standardFontFamily isEqualToString:s]) {
    81         return;
    82     }
     79    if ([standardFontFamily isEqualToString:s])
     80        return;
    8381    [standardFontFamily release];
    8482    standardFontFamily = [s copy];
    … …  
    169167- (void)setMinimumFontSize:(float)size
    170168{
    171     if (minimumFontSize == size) {
    172         return;
    173     }
     169    if (minimumFontSize == size)
     170        return;
    174171    minimumFontSize = size;
    175172    settings->setMinFontSize((int)rint(size));
    … …  
    184181- (void)setMinimumLogicalFontSize:(float)size
    185182{
    186     if (minimumLogicalFontSize == size) {
    187         return;
    188     }
     183    if (minimumLogicalFontSize == size)
     184        return;
    189185    minimumLogicalFontSize = size;
    190186    settings->setMinLogicalFontSize((int)rint(size));
    … …  
    199195- (void)setDefaultFontSize:(float)size
    200196{
    201     if (defaultFontSize == size) {
    202         return;
    203     }
     197    if (defaultFontSize == size)
     198        return;
    204199    defaultFontSize = size;
    205200    settings->setMediumFontSize((int)rint(size));
    … …  
    214209- (void)setDefaultFixedFontSize:(float)size
    215210{
    216     if (defaultFixedFontSize == size) {
    217         return;
    218     }
     211    if (defaultFixedFontSize == size)
     212        return;
    219213    defaultFixedFontSize = size;
    220214    settings->setMediumFixedFontSize((int)rint(size));
    … …  
    288282    [userStyleSheetLocation release];
    289283    userStyleSheetLocation = [s copy];
    290     settings->setUserStyleSheet(DeprecatedString::fromNSString(s));
     284    settings->setUserStyleSheetLocation(DeprecatedString::fromNSString(s));
    291285    [self _updateAllViews];
    292286}

  • trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

    r13393 r13440  
    955955    case CSS_PROP_TEXT_DECORATION:
    956956    {
    957         DeprecatedString string;
     957        String string;
    958958        if (style->textDecoration() & UNDERLINE)
    959959            string += "underline";
    … …  
    979979    case CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT:
    980980    {
    981         DeprecatedString string;
     981        String string;
    982982        if (style->textDecorationsInEffect() & UNDERLINE)
    983983            string += "underline";

  • trunk/WebCore/css/CSSGrammar.y

    r13405 r13440  
    829829    IDENT maybe_space {
    830830        DeprecatedString str = qString($1);
    831         $$ = getPropertyID( str.lower().latin1(), str.length() );
     831        $$ = getPropertyID(str.lower().latin1(), str.length());
    832832#if SVG_SUPPORT
    833833      if ($$ == 0)

  • trunk/WebCore/css/css_stylesheetimpl.cpp

    r13393 r13440  
    337337{
    338338    m_lstMedia.clear();
    339     DeprecatedStringList list = DeprecatedStringList::split( ',', value.deprecatedString() );
    340     for ( DeprecatedStringList::Iterator it = list.begin(); it != list.end(); ++it )
    341     {
     339    DeprecatedStringList list = DeprecatedStringList::split(',', value.deprecatedString());
     340    for (DeprecatedStringList::Iterator it = list.begin(); it != list.end(); ++it) {
    342341        String medium = (*it).stripWhiteSpace();
    343342        if (!medium.isEmpty())
    344             m_lstMedia.append( medium );
    345     }
    346 }
    347 
    348 }
     343            m_lstMedia.append(medium);
     344    }
     345}
     346
     347}

  • trunk/WebCore/css/css_valueimpl.cpp

    r13405 r13440  
    8888
    8989    // FIXME: Also need to transform control characters into \ sequences.
    90     DeprecatedString s = string.deprecatedString();
     90    String s = string;
    9191    s.replace('\\', "\\\\");
    9292    s.replace('\'', "\\'");

  • trunk/WebCore/css/cssparser.cpp

    r13393 r13440  
    20852085    int len = name.length();
    20862086
    2087     if ( !len )
     2087    if (!len)
    20882088        return false;
    2089 
    20902089
    20912090    bool ok;

  • trunk/WebCore/css/cssstyleselector.cpp

    r13439 r13440  
    198198static PseudoState pseudoState;
    199199
    200 CSSStyleSelector::CSSStyleSelector(Document* doc, DeprecatedString userStyleSheet, StyleSheetList *styleSheets, bool _strictParsing)
     200CSSStyleSelector::CSSStyleSelector(Document* doc, const String& userStyleSheet, StyleSheetList *styleSheets, bool _strictParsing)
    201201{
    202202    init();
    … …  
    215215    if (!userStyleSheet.isEmpty()) {
    216216        m_userSheet = new CSSStyleSheet(doc);
    217         m_userSheet->parseString(String(userStyleSheet), strictParsing);
     217        m_userSheet->parseString(userStyleSheet, strictParsing);
    218218
    219219        m_userStyle = new CSSRuleSet();

  • trunk/WebCore/css/cssstyleselector.h

    r13404 r13440  
    7979         * creates a list of rules it needs to apply to objects
    8080         */
    81         CSSStyleSelector(Document* doc, DeprecatedString userStyleSheet,
    82                          StyleSheetList *styleSheets,
    83                          bool _strictParsing);
     81        CSSStyleSelector(Document*, const String& userStyleSheet, StyleSheetList *styleSheets, bool strictParsing);
    8482        /**
    8583         * same as above but for a single stylesheet.

  • trunk/WebCore/dom/Document.cpp

    r13427 r13440  
    368368void Document::resetActiveLinkColor()
    369369{
    370     m_activeLinkColor.setNamedColor(DeprecatedString("red"));
     370    m_activeLinkColor.setNamedColor("red");
    371371}
    372372
    … …  
    716716{
    717717   DeprecatedString state;
    718    if (!m_state.isEmpty())
    719    {
     718   if (!m_state.isEmpty()) {
    720719      state = m_state.first();
    721720      m_state.remove(m_state.begin());
    … …  
    13281327}
    13291328
    1330 void Document::setUserStyleSheet(const DeprecatedString& sheet)
     1329void Document::setUserStyleSheet(const String& sheet)
    13311330{
    13321331    if (m_usersheet != sheet) {
    … …  
    15791578        m_preferredStylesheetSet = content;
    15801579        updateStyleSelector();
    1581     }
    1582     else if (equalIgnoringCase(equiv, "refresh") && frame->metaRefreshEnabled())
    1583     {
     1580    } else if (equalIgnoringCase(equiv, "refresh")) {
    15841581        // get delay and url
    15851582        DeprecatedString str = content.deprecatedString().stripWhiteSpace();
    … …  
    15941591            delay = str.toInt(&ok);
    15951592            // We want a new history item if the refresh timeout > 1 second
    1596             if(ok && frame) frame->scheduleRedirection(delay, frame->url().url(), delay <= 1);
     1593            if (ok && frame)
     1594                frame->scheduleRedirection(delay, frame->url().url(), delay <= 1);
    15971595        } else {
    15981596            double delay = 0;
    … …  
    16131611                frame->scheduleRedirection(delay, completeURL(str), delay <= 1);
    16141612        }
    1615     }
    1616     else if (equalIgnoringCase(equiv, "expires"))
    1617     {
     1613    } else if (equalIgnoringCase(equiv, "expires")) {
    16181614        DeprecatedString str = content.deprecatedString().stripWhiteSpace();
    16191615        time_t expire_date = str.toInt();
    16201616        if (m_docLoader)
    16211617            m_docLoader->setExpireDate(expire_date);
    1622     }
    1623     else if ((equalIgnoringCase(equiv, "pragma") || equalIgnoringCase(equiv, "cache-control")) && frame)
    1624     {
     1618    } else if ((equalIgnoringCase(equiv, "pragma") || equalIgnoringCase(equiv, "cache-control")) && frame) {
    16251619        DeprecatedString str = content.deprecatedString().lower().stripWhiteSpace();
    16261620        KURL url = frame->url();
    1627     }
    1628     else if (equalIgnoringCase(equiv, "set-cookie"))
    1629     {
    1630         // ### make setCookie work on XML documents too; e.g. in case of <html:meta .....>
     1621    } else if (equalIgnoringCase(equiv, "set-cookie")) {
     1622        // ### FIXME: make setCookie work on XML documents too; e.g. in case of <html:meta .....>
    16311623        if (isHTMLDocument())
    16321624            static_cast<HTMLDocument *>(this)->setCookie(content);
    … …  
    19111903    // Create a new style selector
    19121904    delete m_styleSelector;
    1913     DeprecatedString usersheet = m_usersheet;
     1905    String usersheet = m_usersheet;
    19141906    if (m_view && m_view->mediaType() == "print")
    19151907        usersheet += m_printSheet;

  • trunk/WebCore/dom/Document.h

    r13404 r13440  
    281281    // from cachedObjectClient
    282282    virtual void setStyleSheet(const String& url, const String& sheetStr);
    283     void setUserStyleSheet(const DeprecatedString& sheet);
    284     DeprecatedString userStyleSheet() const { return m_usersheet; }
    285     void setPrintStyleSheet(const DeprecatedString& sheet) { m_printSheet = sheet; }
    286     DeprecatedString printStyleSheet() const { return m_printSheet; }
     283    void setUserStyleSheet(const String& sheet);
     284    const String& userStyleSheet() const { return m_usersheet; }
     285    void setPrintStyleSheet(const String& sheet) { m_printSheet = sheet; }
     286    const String& printStyleSheet() const { return m_printSheet; }
    287287
    288288    CSSStyleSheet* elementSheet();
    … …  
    548548
    549549    RefPtr<StyleSheet> m_sheet;
    550     DeprecatedString m_usersheet;
    551     DeprecatedString m_printSheet;
     550    String m_usersheet;
     551    String m_printSheet;
    552552    DeprecatedStringList m_availableSheets;
    553553

  • trunk/WebCore/editing/markup.cpp

    r13426 r13440  
    334334
    335335    Node *commonAncestorBlock = 0;
    336     if (commonAncestor != 0) {
     336    if (commonAncestor)
    337337        commonAncestorBlock = commonAncestor->enclosingBlockFlowElement();
    338     }
    339     if (commonAncestorBlock == 0) {
    340         return "";   
    341     }
     338    if (!commonAncestorBlock)
     339        return "";
    342340
    343341    DeprecatedStringList markups;
    … …  
    366364        next = n->traverseNextNode();
    367365
    368         if (n->isBlockFlow() && next == pastEnd) {
     366        if (n->isBlockFlow() && next == pastEnd)
    369367            // Don't write out an empty block.
    370368            continue;
    371         }
    372369       
    373370        // Add the node to the markup.
    374371        if (n->renderer()) {
    375372            markups.append(startMarkup(n, range, annotate, defaultStyle.get()));
    376             if (nodes) {
     373            if (nodes)
    377374                nodes->append(n);
    378             }
    379375        }
    380376       
    … …  
    391387                    // Close up the ancestors.
    392388                    while (Node *ancestor = ancestorsToClose.last()) {
    393                         if (next != pastEnd && ancestor == next->parentNode()) {
     389                        if (next != pastEnd && ancestor == next->parentNode())
    394390                            break;
    395                         }
    396391                        // Not at the end of the range, close ancestors up to sibling of next node.
    397392                        markups.append(endMarkup(ancestor));
    … …  
    407402                                markups.prepend(startMarkup(parent, range, annotate, defaultStyle.get()));
    408403                                markups.append(endMarkup(parent));
    409                                 if (nodes) {
     404                                if (nodes)
    410405                                    nodes->append(parent);
    411                                 }                           
    412406                                lastClosed = parent;
    413407                            }
    … …  
    416410                }
    417411            }
    418         } else if (n->renderer()) {
     412        } else if (n->renderer())
    419413            // Node is an ancestor, set it to close eventually.
    420414            ancestorsToClose.append(n);
    421         }
    422415    }
    423416   
    … …  
    442435                        || ancestor->hasTagName(ulTag)) {
    443436                    breakAtEnd = true;
    444                 } else {
     437                } else
    445438                    break;
    446                 }
    447439            }
    448440            markups.prepend(startMarkup(ancestor, range, annotate, defaultStyle.get()));
    … …  
    451443                nodes->append(ancestor);
    452444            }       
    453             if (breakAtEnd) {
     445            if (breakAtEnd)
    454446                break;
    455             }
    456447        }
    457448    }
    … …  
    479470}
    480471
    481 PassRefPtr<DocumentFragment> createFragmentFromMarkup(Document* document, const DeprecatedString& markup, const DeprecatedString& baseURL)
     472PassRefPtr<DocumentFragment> createFragmentFromMarkup(Document* document, const String& markup, const String& baseURL)
    482473{
    483474    ASSERT(document->documentElement()->isHTMLElement());
    … …  
    489480
    490481    if (!baseURL.isEmpty() && baseURL != document->baseURL())
    491         completeURLs(fragment.get(), baseURL);
     482        completeURLs(fragment.get(), baseURL.deprecatedString());
    492483
    493484    return fragment.release();
    … …  
    554545
    555546        // Break string into paragraphs. Extra line breaks turn into empty paragraphs.
    556         string.replace(DeprecatedString("\r\n"), "\n");
     547        string.replace("\r\n", "\n");
    557548        string.replace('\r', '\n');
    558549        DeprecatedStringList list = DeprecatedStringList::split('\n', string, true); // true gets us empty strings in the list

  • trunk/WebCore/editing/markup.h

    r13393 r13440  
    4040
    4141PassRefPtr<WebCore::DocumentFragment> createFragmentFromText(WebCore::Document *document, const DeprecatedString &text);
    42 PassRefPtr<WebCore::DocumentFragment> createFragmentFromMarkup(WebCore::Document *document, const DeprecatedString &markup, const DeprecatedString &baseURL);
     42PassRefPtr<WebCore::DocumentFragment> createFragmentFromMarkup(WebCore::Document *document, const String &markup, const String &baseURL);
    4343PassRefPtr<WebCore::DocumentFragment> createFragmentFromNodeList(WebCore::Document *document, const DeprecatedPtrList<WebCore::Node> &nodeList);
    4444

  • trunk/WebCore/html/CanvasRenderingContext2D.cpp

    r13397 r13440  
    281281    // FIXME: Do this through platform-independent GraphicsContext API.
    282282#if __APPLE__
    283     GraphicsContext::setCompositeOperation(drawingContext(), operation.deprecatedString());
     283    GraphicsContext::setCompositeOperation(drawingContext(), operation);
    284284#endif
    285285}

  • trunk/WebCore/html/HTMLTokenizer.cpp

    r13426 r13440  
    387387    if (!parser->skipMode() && !followingFrameset) {
    388388        if (cs) {
    389             if (savedPrependingSrc) {
     389            if (savedPrependingSrc)
    390390                savedPrependingSrc->append(src);
    391             } else {
     391            else
    392392                pendingSrc.prepend(src);
    393             }
    394393            setSrc(SegmentedString());
    395394            scriptCodeSize = scriptCodeResync = 0;

  • trunk/WebCore/html/html_baseimpl.cpp

    r13397 r13440  
    330330        childFrame->openURL(getDocument()->completeURL(relativeURL.deprecatedString()));
    331331    else
    332         parentFrame->requestFrame(static_cast<RenderFrame *>(renderer()), relativeURL.deprecatedString(), m_name.deprecatedString());
     332        parentFrame->requestFrame(static_cast<RenderFrame *>(renderer()), relativeURL, m_name);
    333333}
    334334
    … …  
    425425
    426426    // load the frame contents
    427     frame->requestFrame(static_cast<RenderFrame*>(renderer()), relativeURL.deprecatedString(), m_name.deprecatedString());
     427    frame->requestFrame(static_cast<RenderFrame*>(renderer()), relativeURL, m_name);
    428428}
    429429

  • trunk/WebCore/html/html_headimpl.cpp

    r13397 r13440  
    213213        return;
    214214
    215     DeprecatedString type = m_type.deprecatedString().lower();
     215    String type = m_type.lower();
    216216   
    217217    Frame *frame = getDocument()->frame();
    … …  
    276276
    277277    MediaList *media = new MediaList(m_sheet.get(), m_media);
    278     m_sheet->setMedia( media );
     278    m_sheet->setMedia(media);
    279279
    280280    m_loading = false;

  • trunk/WebCore/html/html_headimpl.h

    r13397 r13440  
    136136    String m_url;
    137137    String m_type;
    138     DeprecatedString m_media;
     138    String m_media;
    139139    int m_disabledState; // 0=unset(default), 1=enabled via script, 2=disabled
    140140    bool m_loading : 1;
    … …  
    142142    bool m_isStyleSheet : 1;
    143143    bool m_isIcon : 1;
    144     DeprecatedString m_data; // needed for temporarily storing the loaded style sheet data
    145144};
    146145
    … …  
    266265    bool m_loading;
    267266    String m_type;
    268     DeprecatedString m_media;
     267    String m_media;
    269268};
    270269

  • trunk/WebCore/html/html_imageimpl.cpp

    r13397 r13440  
    160160        if (renderer())
    161161            static_cast<RenderImage*>(renderer())->updateAltText();
    162     } else if (attrName == srcAttr) {
     162    } else if (attrName == srcAttr)
    163163        m_imageLoader.updateFromElement();
    164     } else if (attrName == widthAttr) {
     164    else if (attrName == widthAttr)
    165165        addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
    166     } else if (attrName == heightAttr) {
     166    else if (attrName == heightAttr)
    167167        addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
    168     } else if (attrName == borderAttr) {
     168    else if (attrName == borderAttr) {
    169169        // border="noborder" -> border="0"
    170170        if(attr->value().toInt()) {
    … …  
    181181        addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
    182182        addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
    183     } else if (attrName == alignAttr) {
     183    } else if (attrName == alignAttr)
    184184        addHTMLAlignment(attr);
    185     } else if (attrName == valignAttr) {
     185    else if (attrName == valignAttr)
    186186        addCSSProperty(attr, CSS_PROP_VERTICAL_ALIGN, attr->value());
    187     } else if (attrName == usemapAttr) {
     187    else if (attrName == usemapAttr) {
    188188        if (attr->value().domString()[0] == '#')
    189189            usemap = attr->value();
    … …  
    191191            usemap = getDocument()->completeURL(parseURL(attr->value()));
    192192        m_isLink = !attr->isNull();
    193     } else if (attrName == ismapAttr) {
     193    } else if (attrName == ismapAttr)
    194194        ismap = true;
    195     } else if (attrName == onabortAttr) {
     195    else if (attrName == onabortAttr)
    196196        setHTMLEventListener(abortEvent, attr);
    197     } else if (attrName == onerrorAttr) {
     197    else if (attrName == onerrorAttr)
    198198        setHTMLEventListener(errorEvent, attr);
    199     } else if (attrName == onloadAttr) {
     199    else if (attrName == onloadAttr)
    200200        setHTMLEventListener(loadEvent, attr);
    201     } else if (attrName == compositeAttr) {
    202         _compositeOperator = attr->value().deprecatedString();
    203     } else if (attrName == nameAttr) {
     201    else if (attrName == compositeAttr)
     202        _compositeOperator = attr->value().domString();
     203    else if (attrName == nameAttr) {
    204204        String newNameAttr = attr->value();
    205205        if (inDocument() && getDocument()->isHTMLDocument()) {

  • trunk/WebCore/html/html_imageimpl.h

    r13397 r13440  
    9696    virtual bool isURLAttribute(Attribute*) const;
    9797
    98     Image::CompositeOperator compositeOperator() const { return Image::compositeOperatorFromString(_compositeOperator.ascii()); }
     98    Image::CompositeOperator compositeOperator() const { return Image::compositeOperatorFromString(_compositeOperator); }
    9999
    100100    CachedImage* cachedImage() const { return m_imageLoader.image(); }
    … …  
    145145    HTMLFormElement* m_form;
    146146    String oldNameAttr;
    147     DeprecatedString _compositeOperator;
     147    String _compositeOperator;
    148148};
    149149

  • trunk/WebCore/html/html_objectimpl.cpp

    r13397 r13440  
    161161RenderObject *HTMLAppletElement::createRenderer(RenderArena *arena, RenderStyle *style)
    162162{
    163 #ifndef Q_WS_QWS // FIXME(E)? I don't think this is possible with Qt Embedded...
    164163    Frame *frame = getDocument()->frame();
    165164
    166     if( frame && frame->javaEnabled() )
    167     {
     165    if (frame && frame->javaEnabled()) {
    168166        HashMap<String, String> args;
    169167
    … …  
    193191    // render the alternative content given by the webpage
    194192    return new (getDocument()->renderArena()) RenderEmptyApplet(this);
    195 #else
    196     return 0;
    197 #endif
    198193}
    199194

  • trunk/WebCore/ksvg2/svg/SVGStringList.cpp

    r13393 r13440  
    4141{
    4242    DeprecatedStringList list = DeprecatedStringList::split(' ', str);
    43     if(list.count() == 0)
    44     {
     43    if (list.count() == 0) {
    4544        StringImpl *item = new StringImpl(str);
    4645        item->ref();
    4746        appendItem(item);
    48     }
    49     else for(DeprecatedStringList::Iterator it = list.begin(); it != list.end(); ++it)
    50     {
     47    } else for(DeprecatedStringList::Iterator it = list.begin(); it != list.end(); ++it) {
    5148        StringImpl *item = new StringImpl((*it));
    5249        item->ref();

  • trunk/WebCore/kwq/AccessibilityObjectCache.h

    r13393 r13440  
    3838#endif
    3939
    40 class DeprecatedString;
    41 
    4240namespace WebCore {
    4341    class RenderObject;
    … …  
    6765    void childrenChanged(WebCore::RenderObject* renderer);
    6866
    69     void postNotification(WebCore::RenderObject* renderer, const DeprecatedString& msg);
    70     void postNotificationToTopWebArea(WebCore::RenderObject* renderer, const DeprecatedString& msg);
     67    void postNotification(WebCore::RenderObject* renderer, const WebCore::String& msg);
     68    void postNotificationToTopWebArea(WebCore::RenderObject* renderer, const WebCore::String& msg);
    7169    void handleFocusedUIElementChanged(void);
    7270   

  • trunk/WebCore/kwq/AccessibilityObjectCache.mm

    r13393 r13440  
    3030#import <kxmlcore/Assertions.h>
    3131#import "FoundationExtras.h"
    32 #import "DeprecatedString.h"
    3332#import "RenderObject.h"
    3433#import "WebCoreViewFactory.h"
    3534#import "Document.h"
    3635
    37 using WebCore::EAffinity;
    38 using WebCore::RenderObject;
    39 using WebCore::VisiblePosition;
     36using namespace WebCore;
    4037
    4138// The simple Cocoa calls in this file don't throw exceptions.
    … …  
    4542typedef struct KWQTextMarkerData  {
    4643    WebCoreAXID  axObjectID;
    47     WebCore::Node*  nodeImpl;
     44    Node*  nodeImpl;
    4845    int             offset;
    4946    EAffinity       affinity;
    … …  
    160157WebCoreTextMarker *AccessibilityObjectCache::textMarkerForVisiblePosition (const VisiblePosition &visiblePos)
    161158{
    162     WebCore::Position deepPos = visiblePos.deepEquivalent();
    163     WebCore::Node* domNode = deepPos.node();
     159    Position deepPos = visiblePos.deepEquivalent();
     160    Node* domNode = deepPos.node();
    164161    ASSERT(domNode != NULL);
    165162    if (domNode == NULL)
    … …  
    167164   
    168165    // locate the renderer, which must exist for a visible dom node
    169     WebCore::RenderObject* renderer = domNode->renderer();
     166    RenderObject* renderer = domNode->renderer();
    170167    ASSERT(renderer != NULL);
    171168   
    … …  
    214211}
    215212
    216 void AccessibilityObjectCache::postNotificationToTopWebArea(RenderObject* renderer, const DeprecatedString& msg)
     213void AccessibilityObjectCache::postNotificationToTopWebArea(RenderObject* renderer, const String& msg)
    217214{
    218215    if (renderer) {
    219216        RenderObject * obj = renderer->document()->topDocument()->renderer();
    220         NSAccessibilityPostNotification(accObject(obj), msg.getNSString());
    221     }
    222 }
    223 
    224 void AccessibilityObjectCache::postNotification(RenderObject* renderer, const DeprecatedString& msg)
     217        NSAccessibilityPostNotification(accObject(obj), msg);
     218    }
     219}
     220
     221void AccessibilityObjectCache::postNotification(RenderObject* renderer, const String& msg)
    225222{
    226223    if (renderer)
    227         NSAccessibilityPostNotification(accObject(renderer), msg.getNSString());
     224        NSAccessibilityPostNotification(accObject(renderer), msg);
    228225}
    229226

  • trunk/WebCore/kwq/ClipboardMac.mm

    r13404 r13440  
    7575
    7676    // two special cases for IE compatibility
    77     if (qType == "Text") {
     77    if (qType == "Text")
    7878        return NSStringPboardType;
    79     }
    80     if (qType == "URL") {
     79    if (qType == "URL")
    8180        return NSURLPboardType;
    82     }
    8381
    8482    // Ignore any trailing charset - JS strings are Unicode, which encapsulates the charset issue
    85     if (qType == "text/plain" || qType.startsWith("text/plain;")) {
     83    if (qType == "text/plain" || qType.startsWith("text/plain;"))
    8684        return NSStringPboardType;
    87     }
    88     if (qType == "text/uri-list") {
     85    if (qType == "text/uri-list")
    8986        // special case because UTI doesn't work with Cocoa's URL type
    9087        return NSURLPboardType; // note special case in getData to read NSFilenamesType
    91     }
    9288   
    9389    // Try UTI now
    … …  
    9793        CFStringRef pbType = UTTypeCopyPreferredTagWithClass(UTIType, kUTTagClassNSPboardType);
    9894        CFRelease(UTIType);
    99         if (pbType) {
     95        if (pbType)
    10096            return KWQCFAutorelease(pbType);
    101         }
    10297    }
    10398

  • trunk/WebCore/kwq/KWQKHTMLSettings.h

    r13404 r13440  
    2929#include "PlatformString.h"
    3030#include "Font.h"
     31#include "KURL.h"
    3132
    3233class KHTMLSettings
    … …  
    6061    const DeprecatedString& encoding() const { return m_encoding; }
    6162
    62     DeprecatedString userStyleSheet() const { return m_userStyleSheetLocation; }
     63    KURL userStyleSheetLocation() const { return m_userStyleSheetLocation; }
    6364    bool shouldPrintBackgrounds() const { return m_shouldPrintBackgrounds; }
    6465    bool textAreasAreResizable() const { return m_textAreasAreResizable; }
    … …  
    8485    void setEncoding(const DeprecatedString& s) { m_encoding = s; }
    8586
    86     void setUserStyleSheet(const DeprecatedString& s) { m_userStyleSheetLocation = s; }
     87    void setUserStyleSheetLocation(const KURL& s) { m_userStyleSheetLocation = s; }
    8788    void setShouldPrintBackgrounds(bool f) { m_shouldPrintBackgrounds = f; }
    8889    void setTextAreasAreResizable(bool f) { m_textAreasAreResizable = f; }
    … …  
    9697    WebCore::AtomicString m_fantasyFontName;
    9798    DeprecatedString m_encoding; // FIXME: TextEncoding takes a latin1 string, which String & AtomicString don't easily produce
    98     DeprecatedString m_userStyleSheetLocation; // FIXME: KURLs still use DeprecatedString
     99    KURL m_userStyleSheetLocation;
    99100   
    100101    int m_minimumFontSize;

  • trunk/WebCore/kwq/KWQLineEdit.h

    r13393 r13440  
    2424 */
    2525
    26 #ifndef QLINEEDIT_H_
    27 #define QLINEEDIT_H_
     26#ifndef QLineEdit_H
     27#define QLineEdit_H
    2828
    2929#include "PlatformString.h"
    30 #include "DeprecatedString.h"
    3130#include "TextDirection.h"
    3231#include "Widget.h"
    … …  
    7776   
    7877    int selectionStart() const;
    79     DeprecatedString selectedText() const;
     78    WebCore::String selectedText() const;
    8079    void setSelection(int, int);
    8180   

  • trunk/WebCore/kwq/KWQLineEdit.mm

    r13393 r13440  
    211211}
    212212
    213 DeprecatedString QLineEdit::selectedText() const
     213String QLineEdit::selectedText() const
    214214{
    215215    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    216216    NSRange range = [m_controller selectedRange];
    217217    NSString *str = [m_controller string];
    218     return DeprecatedString::fromNSString([str substringWithRange:range]);
    219     END_BLOCK_OBJC_EXCEPTIONS;
    220     return DeprecatedString();
     218    return [str substringWithRange:range];
     219    END_BLOCK_OBJC_EXCEPTIONS;
     220    return String();
    221221}
    222222

  • trunk/WebCore/loader/CachedCSSStyleSheet.cpp

    r13404 r13440  
    6868    CachedObject::ref(c);
    6969
    70     if(!m_loading) c->setStyleSheet( m_url, m_sheet );
     70    if (!m_loading)
     71        c->setStyleSheet(m_url, m_sheet);
    7172}
    7273

  • trunk/WebCore/page/Frame.cpp

    r13428 r13440  
    121121    }
    122122private:
    123     virtual void setStyleSheet(const String&, const String& sheet)
     123    virtual void setStyleSheet(const String& /*URL*/, const String& sheet)
    124124    {
    125125        m_frame->setUserStyleSheet(sheet.deprecatedString());
    … …  
    346346bool Frame::jScriptEnabled() const
    347347{
    348   return d->m_bJScriptEnabled;
    349 }
    350 
    351 void Frame::setMetaRefreshEnabled(bool enable)
    352 {
    353   d->m_metaRefreshEnabled = enable;
    354 }
    355 
    356 bool Frame::metaRefreshEnabled() const
    357 {
    358   return d->m_metaRefreshEnabled;
     348    return d->m_bJScriptEnabled;
    359349}
    360350
    … …  
    417407bool Frame::javaEnabled() const
    418408{
    419 #ifndef Q_WS_QWS
    420   return d->m_bJavaEnabled;
    421 #else
    422   return false;
    423 #endif
     409    return d->m_settings->isJavaEnabled();
    424410}
    425411
    426412bool Frame::pluginsEnabled() const
    427413{
    428   return d->m_bPluginsEnabled;
     414    return d->m_bPluginsEnabled;
    429415}
    430416
    … …  
    517503    // Support for http-refresh
    518504    qData = d->m_job->queryMetaData("http-refresh").deprecatedString();
    519     if (!qData.isEmpty() && d->m_metaRefreshEnabled) {
     505    if (!qData.isEmpty()) {
    520506      double delay;
    521507      int pos = qData.find(';');
    … …  
    633619
    634620  setAutoloadImages(d->m_settings->autoLoadImages());
    635   String userStyleSheet = d->m_settings->userStyleSheet();
     621  const KURL& userStyleSheet = d->m_settings->userStyleSheetLocation();
    636622
    637623  if (!userStyleSheet.isEmpty())
    … …  
    10381024}
    10391025
    1040 void Frame::setUserStyleSheet(const DeprecatedString& styleSheet)
     1026void Frame::setUserStyleSheet(const String& styleSheet)
    10411027{
    10421028    delete d->m_userStyleSheetLoader;
    … …  
    13751361
    13761362bool Frame::requestObject(RenderPart* renderer, const String& url, const AtomicString& frameName,
    1377                           const String& mimeType, const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues)
     1363                          const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues)
    13781364{
    13791365    KURL completedURL;
    … …  
    14071393
    14081394bool Frame::loadPlugin(RenderPart *renderer, const KURL& url, const String& mimeType,
    1409                        const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues, bool useFallback)
     1395                       const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback)
    14101396{
    14111397    if (useFallback) {
    … …  
    16341620DeprecatedString Frame::referrer() const
    16351621{
    1636    return d->m_referrer;
     1622    return d->m_referrer;
    16371623}
    16381624
    16391625String Frame::lastModified() const
    16401626{
    1641   return d->m_lastModified;
     1627    return d->m_lastModified;
    16421628}
    16431629
    16441630void Frame::reparseConfiguration()
    16451631{
    1646   setAutoloadImages(d->m_settings->autoLoadImages());
    1647   if (d->m_doc)
    1648      d->m_doc->docLoader()->setShowAnimations(KHTMLSettings::KAnimationEnabled);
    1649 
    1650   d->m_bJScriptEnabled = d->m_settings->isJavaScriptEnabled();
    1651   d->m_bJavaEnabled = d->m_settings->isJavaEnabled();
    1652   d->m_bPluginsEnabled = d->m_settings->isPluginsEnabled();
    1653 
    1654   DeprecatedString userStyleSheet = d->m_settings->userStyleSheet();
    1655   if (!userStyleSheet.isEmpty())
    1656     setUserStyleSheetLocation(KURL(userStyleSheet));
    1657   else
    1658     setUserStyleSheet(DeprecatedString());
    1659 
    1660   if (d->m_doc) d->m_doc->updateStyleSelector();
     1632    setAutoloadImages(d->m_settings->autoLoadImages());
     1633    if (d->m_doc)
     1634        d->m_doc->docLoader()->setShowAnimations(KHTMLSettings::KAnimationEnabled);
     1635       
     1636    d->m_bJScriptEnabled = d->m_settings->isJavaScriptEnabled();
     1637    d->m_bJavaEnabled = d->m_settings->isJavaEnabled();
     1638    d->m_bPluginsEnabled = d->m_settings->isPluginsEnabled();
     1639
     1640    const KURL& userStyleSheetLocation = d->m_settings->userStyleSheetLocation();
     1641    if (!userStyleSheetLocation.isEmpty())
     1642        setUserStyleSheetLocation(userStyleSheetLocation);
     1643    else
     1644        setUserStyleSheet(String());
    16611645}
    16621646
    … …  
    17971781                Position start = sel.start();
    17981782                short before = Range::compareBoundaryPoints(pos.node(), pos.offset(), start.node(), start.offset());
    1799                 if (before <= 0) {
     1783                if (before <= 0)
    18001784                    sel.setBaseAndExtent(pos.node(), pos.offset(), sel.end().node(), sel.end().offset());
    1801                 } else {
     1785                else
    18021786                    sel.setBaseAndExtent(start.node(), start.offset(), pos.node(), pos.offset());
    1803                 }
    1804 
    1805                 if (d->m_selectionGranularity != CharacterGranularity) {
     1787
     1788                if (d->m_selectionGranularity != CharacterGranularity)
    18061789                    sel.expandUsingGranularity(d->m_selectionGranularity);
    1807                 }
    18081790                d->m_beganSelectingText = true;
    18091791            } else {
    … …  
    19751957{
    19761958    SelectionController sel(cmd.endingSelection());
    1977     if (shouldChangeSelection(sel)) {
     1959    if (shouldChangeSelection(sel))
    19781960        setSelection(sel, false);
    1979     }
    19801961   
    19811962    dispatchEditableContentChangedEvent(!selection().isNone() ? selection().start().node()->rootEditableElement() : 0);
    … …  
    20081989{
    20091990    SelectionController sel(cmd.startingSelection());
    2010     if (shouldChangeSelection(sel)) {
     1991    if (shouldChangeSelection(sel))
    20111992        setSelection(sel, true);
    2012     }
    20131993   
    20141994    dispatchEditableContentChangedEvent(!selection().isNone() ? selection().start().node()->rootEditableElement() : 0);
    … …  
    20222002{
    20232003    SelectionController sel(cmd.endingSelection());
    2024     if (shouldChangeSelection(sel)) {
     2004    if (shouldChangeSelection(sel))
    20252005        setSelection(sel, true);
    2026     }
    20272006   
    20282007    dispatchEditableContentChangedEvent(!selection().isNone() ? selection().start().node()->rootEditableElement() : 0);

  • trunk/WebCore/page/Frame.h

    r13428 r13440  
    4242#include <DeprecatedStringList.h>
    4343#include <kxmlcore/Noncopyable.h>
     44#include <kxmlcore/Vector.h>
    4445
    4546class KHTMLSettings;
    … …  
    139140   */
    140141  bool pluginsEnabled() const;
    141  
    142   /**
    143    * Enable/disable the automatic forwarding by <meta http-equiv="refresh" ....>
    144    */
    145   void setMetaRefreshEnabled(bool enable);
    146 
    147   /**
    148    * Returns @p true if automtaic forwarding is enabled.
    149    */
    150   bool metaRefreshEnabled() const;
    151142
    152143  /**
    … …  
    270261
    271262  /**
    272    * Sets a user defined style sheet to be used on top of the HTML 4
    273    * default style sheet.
    274    *
    275    * This gives a wide range of possibilities to
    276    * change the layout of the page.
     263   * Sets a user defined style sheet to be used on top of the HTML4,
     264   * SVG and printing default style sheets.
    277265   */
    278266  void setUserStyleSheetLocation(const KURL& url);
    279 
    280   /**
    281    * Sets a user defined style sheet to be used on top of the HTML 4
    282    * default style sheet.
    283    *
    284    * This gives a wide range of possibilities to
    285    * change the layout of the page.
    286    */
    287   void setUserStyleSheet(const DeprecatedString& styleSheet);
    288 
     267  void setUserStyleSheet(const String& styleSheetData);
     268 
    289269  /**
    290270   * Sets the standard font style.
    … …  
    597577  virtual String overrideMediaType() const = 0;
    598578protected:
    599   virtual Plugin* createPlugin(const KURL& url, const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues, const String& mimeType) = 0;
     579  virtual Plugin* createPlugin(const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType) = 0;
    600580  virtual Frame* createFrame(const KURL& url, const String& name, RenderPart* renderer, const String& referrer) = 0;
    601581  virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType) = 0;
    … …  
    643623  bool shouldUsePlugin(Node* element, const KURL& url, const String& mimeType, bool hasFallback, bool& useFallback);
    644624  bool loadPlugin(RenderPart* renderer, const KURL& url, const String& mimeType,
    645                   const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues, bool useFallback);
     625                  const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback);
    646626  Frame* loadSubframe(RenderPart* renderer, const KURL& url, const String& name, const String& referrer);
    647627
    … …  
    652632 
    653633  bool requestObject(RenderPart* frame, const String& url, const AtomicString& frameName,
    654                      const String& serviceType, const DeprecatedStringList& paramNames, const DeprecatedStringList& paramValues);
     634                     const String& serviceType, const Vector<String>& paramNames, const Vector<String>& paramValues);
    655635  bool requestFrame(RenderPart* frame, const String& url, const AtomicString& frameName);
    656636

  • trunk/WebCore/page/FramePrivate.h

    r13404 r13440  
    6363            , m_bJavaEnabled(true)
    6464            , m_bPluginsEnabled(true)
    65             , m_metaRefreshEnabled(true)
    6665            , m_settings(0)
    6766            , m_job(0)
    … …  
    129128        bool m_bJavaEnabled : 1;
    130129        bool m_bPluginsEnabled : 1;
    131         bool m_metaRefreshEnabled : 1;
    132130
    133131        KHTMLSettings* m_settings;

  • trunk/WebCore/platform/AtomicString.h

    r13405 r13440  
    3434   
    3535    AtomicString() { }
     36    AtomicString(QChar c) : m_string(add(&c, 1)) { }
    3637    AtomicString(const char* s) : m_string(add(s)) { }
    3738    AtomicString(const QChar* s, int length) : m_string(add(s, length)) { }

  • trunk/WebCore/platform/DeprecatedString.cpp

    r13405 r13440  
    21772177}
    21782178
    2179 DeprecatedString &DeprecatedString::replace( unsigned index, unsigned len, const DeprecatedString &str )
     2179DeprecatedString &DeprecatedString::replace(unsigned index, unsigned len, const DeprecatedString& str)
    21802180{
    21812181    return remove(index, len).insert(index, str);
    … …  
    21932193}
    21942194
    2195 
    21962195DeprecatedString &DeprecatedString::replace(QChar pattern, const DeprecatedString &str)
    21972196{
    … …  
    22042203    return *this;
    22052204}
    2206 
    22072205
    22082206DeprecatedString &DeprecatedString::replace(const DeprecatedString &pattern, const DeprecatedString &str)

  • trunk/WebCore/platform/GraphicsContext.h

    r13429 r13440  
    160160        static CGContextRef currentCGContext();
    161161        static int getCompositeOperation(CGContextRef);
    162         static void setCompositeOperation(CGContextRef, const DeprecatedString& operation);
     162        static void setCompositeOperation(CGContextRef, const String& operation);
    163163        static void setCompositeOperation(CGContextRef, int operation);
    164164#endif

  • trunk/WebCore/platform/Image.h

    r13404 r13440  
    3232#include "IntSize.h"
    3333
    34 class DeprecatedString;
    35 
    3634#if __APPLE__
    3735#include <ApplicationServices/ApplicationServices.h>

  • trunk/WebCore/platform/KURL.cpp

    r13404 r13440  
    260260}
    261261
    262 KURL::KURL(const String& stringURL)
    263 {
    264     DeprecatedString url = stringURL.deprecatedString();
    265     if (!url.isEmpty() && url[0] == '/') {
    266         // 5 for "file:", 1 for terminator
    267         Vector<char, 2048> buffer(url.length() + 6);
    268         buffer[0] = 'f';
    269         buffer[1] = 'i';
    270         buffer[2] = 'l';
    271         buffer[3] = 'e';
    272         buffer[4] = ':';
    273         url.copyLatin1(&buffer[5]);
    274         parse(buffer, 0);
    275     } else
    276         parse(url.ascii(), &url);
    277 }
    278 
    279262KURL::KURL(const KURL &base, const DeprecatedString &relative, const WebCore::TextEncoding& encoding)
    280263{

  • trunk/WebCore/platform/KURL.h

    r13404 r13440  
    5050    KURL(const KURL&, const DeprecatedString&, const WebCore::TextEncoding& encoding = WebCore::TextEncoding(WebCore::UTF8Encoding));
    5151    KURL(const DeprecatedString&);
    52     KURL(const WebCore::String&);
    5352#if __APPLE__
    5453    KURL(NSURL*);

  • trunk/WebCore/platform/PlatformString.h

    r13405 r13440  
    4444public:
    4545    String() { } // gives null string, distinguishable from an empty string
     46    String(QChar c) : m_impl(new StringImpl(&c, 1)) { }
    4647    String(const QChar*, unsigned length);
    4748    String(const DeprecatedString&);
    … …  
    7778
    7879    String& replace(QChar a, QChar b) { if (m_impl) m_impl = m_impl->replace(a, b); return *this; }
     80    String& replace(QChar a, const String& b) { if (m_impl) m_impl = m_impl->replace(a, b.impl()); return *this; }
    7981
    8082    unsigned length() const;
    … …  
    127129
    128130String operator+(const String&, const String&);
     131String operator+(const String&, const char*);
     132String operator+(const char*, const String&);
     133String operator+(const String&, QChar);
     134String operator+(QChar, const String&);
     135String operator+(const String&, char);
     136String operator+(char, const String&);
    129137
    130138inline bool operator==(const String& a, const String& b) { return equal(a.impl(), b.impl()); }

  • trunk/WebCore/platform/String.cpp

    r13405 r13440  
    8989}
    9090
     91String operator+(const String& s, const char* cs)
     92{
     93    return s + String(cs);
     94}
     95
     96String operator+(const char* cs, const String& s)
     97{
     98    return String(cs) + s;
     99}
     100
     101String operator+(const String& s, QChar c)
     102{
     103    return s + String(c);
     104}
     105
     106String operator+(QChar c, const String& s)
     107{
     108    return String(c) + s;
     109}
     110
     111String operator+(const String& s, char c)
     112{
     113    return s + String(c);
     114}
     115
     116String operator+(char c, const String& s)
     117{
     118    return String(c) + s;
     119}
     120
    91121void String::insert(const String& str, unsigned pos)
    92122{

  • trunk/WebCore/platform/StringImpl.cpp

    r13405 r13440  
    165165{
    166166    assert(!_inTable);
    167     if(len <= 0) return;
    168     if(pos >= l ) return;
    169     if((unsigned)len > l - pos)
    170     len = l - pos;
     167    if (len <= 0)
     168        return;
     169    if (pos >= l )
     170        return;
     171    if ((unsigned)len > l - pos)
     172        len = l - pos;
    171173
    172174    unsigned newLen = l-len;
    … …  
    249251
    250252    if (ok) {
    251         if (i == l) {
     253        if (i == l)
    252254            return Length(r, Fixed);
    253         } else {
     255        else {
    254256            const QChar* next = s+i;
    255257
    … …  
    639641}
    640642
     643StringImpl* StringImpl::replace(unsigned index, unsigned len, const StringImpl* str)
     644{
     645    StringImpl* s = copy();
     646    s->remove(index, len);
     647    s->insert(str, index);
     648    return s;
     649}
     650
     651StringImpl* StringImpl::replace(QChar pattern, const StringImpl* str)
     652{
     653    int slen = str ? str->length() : 0;
     654    int index = 0;
     655    StringImpl* result = this;
     656    while ((index = result->find(pattern, index)) >= 0) {
     657        result = result->replace(index, 1, str);
     658        index += slen;
     659    }
     660    return result;
     661}
     662
    641663bool equal(const StringImpl* a, const StringImpl* b)
    642664{

  • trunk/WebCore/platform/StringImpl.h

    r13405 r13440  
    7373    void truncate(int len);
    7474    void remove(unsigned pos, int len = 1);
     75   
    7576    StringImpl* split(unsigned pos);
    7677    StringImpl* copy() const { return new StringImpl(s, l); }
    … …  
    102103    bool endsWith(const StringImpl*, bool caseSensitive = true) const;
    103104
    104     // This modifies the string in place if there is only one ref, makes a new string otherwise.
     105    // Does not modify the string.
    105106    StringImpl* replace(QChar, QChar);
     107    StringImpl* replace(QChar a, const StringImpl* b);
     108    StringImpl* replace(unsigned index, unsigned len, const StringImpl*);
    106109
    107110    static StringImpl* empty();

  • trunk/WebCore/platform/mac/GraphicsContextMac.mm

    r13396 r13440  
    357357}
    358358
    359 void GraphicsContext::setCompositeOperation (CGContextRef context, const DeprecatedString& op)
    360 {
    361     [[WebCoreImageRendererFactory sharedFactory] setCGCompositeOperationFromString:op.getNSString() inContext:context];
     359void GraphicsContext::setCompositeOperation (CGContextRef context, const String& op)
     360{
     361    [[WebCoreImageRendererFactory sharedFactory] setCGCompositeOperationFromString:op inContext:context];
    362362}
    363363

  • trunk/WebCore/rendering/RenderHTMLCanvas.cpp

    r13397 r13440  
    148148    bool drawSelectionTint = (selectionState() != SelectionNone) && !isPrinting;
    149149    if (i.phase == PaintActionSelection) {
    150         if (selectionState() == SelectionNone) {
     150        if (selectionState() == SelectionNone)
    151151            return;
    152         }
    153152        drawSelectionTint = false;
    154153    }

  • trunk/WebCore/rendering/render_form.cpp

    r13393 r13440  
    690690            }
    691691            else if (listItems[listIndex]->hasTagName(hrTag)) {
    692                 if (!m_useListBox) {
     692                if (!m_useListBox)
    693693                    static_cast<QComboBox*>(m_widget)->appendSeparator();
    694                 }
    695694            }
    696695            else

  • trunk/WebCore/rendering/render_frames.cpp

    r13397 r13440  
    678678}
    679679
    680 static bool isURLAllowed(WebCore::Document *doc, const DeprecatedString &url)
    681 {
    682     KURL newURL(doc->completeURL(url));
     680static bool isURLAllowed(WebCore::Document *doc, const String &url)
     681{
     682    KURL newURL(doc->completeURL(url.deprecatedString()));
    683683    newURL.setRef(DeprecatedString::null);
    684684   
    … …  
    701701}
    702702
    703 static inline void mapClassIdToServiceType(const DeprecatedString &classId, DeprecatedString &serviceType)
     703static inline void mapClassIdToServiceType(const String& classId, String& serviceType)
    704704{
    705705    // It is ActiveX, but the nsplugin system handling
    … …  
    727727void RenderPartObject::updateWidget()
    728728{
    729   DeprecatedString url;
    730   DeprecatedString serviceType;
    731   DeprecatedStringList paramNames;
    732   DeprecatedStringList paramValues;
     729  String url;
     730  String serviceType;
     731  Vector<String> paramNames;
     732  Vector<String> paramValues;
    733733  Frame *frame = m_view->frame();
    734734
    … …  
    747747              embed = static_cast<HTMLEmbedElement *>( child );
    748748              break;
    749           } else if (child->hasTagName(objectTag)) {
     749          } else if (child->hasTagName(objectTag))
    750750              child = child->nextSibling();         // Don't descend into nested OBJECT tags
    751           } else {
     751          else
    752752              child = child->traverseNextNode(o);   // Otherwise descend (EMBEDs may be inside COMMENT tags)
    753           }
    754753      }
    755754     
    … …  
    759758          embedOrObject = (HTMLElement *)embed;
    760759          String attribute = embedOrObject->getAttribute(widthAttr);
    761           if (!attribute.isEmpty()) {
     760          if (!attribute.isEmpty())
    762761              o->setAttribute(widthAttr, attribute);
    763           }
    764762          attribute = embedOrObject->getAttribute(heightAttr);
    765           if (!attribute.isEmpty()) {
     763          if (!attribute.isEmpty())
    766764              o->setAttribute(heightAttr, attribute);
    767           }
    768765          url = embed->url;
    769766          serviceType = embed->serviceType;
    770       } else {
     767      } else
    771768          embedOrObject = (HTMLElement *)o;
    772       }
    773769     
    774770      // If there was no URL or type defined in EMBED, try the OBJECT tag.
    775       if (url.isEmpty()) {
     771      if (url.isEmpty())
    776772          url = o->url;
    777       }
    778       if (serviceType.isEmpty()) {
     773      if (serviceType.isEmpty())
    779774          serviceType = o->serviceType;
    780       }
    781775     
    782776      HashSet<StringImpl*, CaseInsensitiveHash> uniqueParamNames;
    … …  
    791785              String name = p->name().lower();
    792786              if (url.isEmpty() && (name == "src" || name == "movie" || name == "code" || name == "url"))
    793                   url = p->value().deprecatedString();
     787                  url = p->value();
    794788              if (serviceType.isEmpty() && name == "type") {
    795                   serviceType = p->value().deprecatedString();
    796                   int pos = serviceType.find( ";" );
    797                   if (pos != -1) {
     789                  serviceType = p->value();
     790                  int pos = serviceType.find(";");
     791                  if (pos != -1)
    798792                      serviceType = serviceType.left(pos);
    799                   }
    800793              }
    801794              if (!embed && !name.isEmpty()) {
    802795                  uniqueParamNames.add(p->name().impl());
    803                   paramNames.append(p->name().deprecatedString());
    804                   paramValues.append(p->value().deprecatedString());
     796                  paramNames.append(p->name());
     797                  paramValues.append(p->value());
    805798              }
    806799          }
    … …  
    826819              const AtomicString& name = it->name().localName();
    827820              if (embed || !uniqueParamNames.contains(name.impl())) {
    828                   paramNames.append(name.deprecatedString());
    829                   paramValues.append(it->value().deprecatedString());
     821                  paramNames.append(name.domString());
     822                  paramValues.append(it->value().domString());
    830823              }
    831824          }
    … …  
    834827      // If we still don't have a type, try to map from a specific CLASSID to a type.
    835828      if (serviceType.isEmpty() && !o->classId.isEmpty())
    836           mapClassIdToServiceType(o->classId.deprecatedString(), serviceType);
     829          mapClassIdToServiceType(o->classId, serviceType);
    837830     
    838831      // If no URL and type, abort.
    … …  
    849842              m_hasFallbackContent = true;
    850843      }
    851       bool success = frame->requestObject(this, url, o->name().deprecatedString(), serviceType, paramNames, paramValues);
     844      bool success = frame->requestObject(this, url, AtomicString(o->name()), serviceType, paramNames, paramValues);
    852845      if (!success && m_hasFallbackContent)
    853846          o->renderFallbackContent();
    … …  
    867860          for (unsigned i = 0; i < a->length(); ++i) {
    868861              Attribute* it = a->attributeItem(i);
    869               paramNames.append(it->name().localName().deprecatedString());
    870               paramValues.append(it->value().deprecatedString());
     862              paramNames.append(it->name().localName().domString());
     863              paramValues.append(it->value().domString());
    871864          }
    872865      }
    873       frame->requestObject(this, url, o->getAttribute(nameAttr).deprecatedString(), serviceType, paramNames, paramValues);
     866      frame->requestObject(this, url, o->getAttribute(nameAttr), serviceType, paramNames, paramValues);
    874867  } else {
    875868      assert(element()->hasTagName(iframeTag));
    876869      HTMLIFrameElement *o = static_cast<HTMLIFrameElement *>(element());
    877       url = o->m_URL.deprecatedString();
     870      url = o->m_URL;
    878871      if (!isURLAllowed(document(), url))
    879872          return;
    … …  
    881874          url = "about:blank";
    882875      FrameView *v = static_cast<FrameView *>(m_view);
    883       v->frame()->requestFrame(this, url, o->m_name.deprecatedString());
     876      v->frame()->requestFrame(this, url, o->m_name);
    884877  }
    885878}

  • trunk/WebCore/rendering/render_style.h

    r13393 r13440  
    13511351        region.offset.left = l;
    13521352        region.type = type;
    1353         if (!append) {
    1354             css3NonInheritedData.access()->m_dashboardRegions.clear ();
    1355         }
    1356         css3NonInheritedData.access()->m_dashboardRegions.append (region);
     1353        if (!append)
     1354            css3NonInheritedData.access()->m_dashboardRegions.clear();
     1355        css3NonInheritedData.access()->m_dashboardRegions.append(region);
    13571356    }
    13581357

  • trunk/WebCore/xml/xmlhttprequest.cpp

    r13404 r13440  
    104104        pos = contentTypeString.find("charset", pos, false);
    105105        if (pos <= 0)
    106             return DeprecatedString();
     106            return String();
    107107       
    108108        // is what we found a beginning of a word?
    … …  
    293293
    294294    if (!body.isNull() && m_method.lower() != "get" && m_method.lower() != "head" && (m_url.protocol().lower() == "http" || m_url.protocol().lower() == "https")) {
    295         DeprecatedString contentType = getRequestHeader("Content-Type");
     295        String contentType = getRequestHeader("Content-Type");
    296296        String charset;
    297297        if (contentType.isEmpty())
    … …  
    369369void XMLHttpRequest::overrideMIMEType(const String& override)
    370370{
    371     m_mimeTypeOverride = override.deprecatedString();
     371    m_mimeTypeOverride = override;
    372372}
    373373
Note: See TracChangeset for help on using the changeset viewer.