Reviewed and landed by Sam.
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 Feb 2008 20:13:06 +0000 (20:13 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 Feb 2008 20:13:06 +0000 (20:13 +0000)
        Remove DeprecatedStringList.

        * GNUmakefile.am:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * WebCoreSources.bkl:
        * editing/markup.cpp:
        * platform/DeprecatedStringList.cpp: Removed.
        * platform/DeprecatedStringList.h: Removed.
        * platform/mac/DeprecatedStringListMac.mm: Removed.

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

WebCore/ChangeLog
WebCore/GNUmakefile.am
WebCore/WebCore.pro
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/WebCoreSources.bkl
WebCore/editing/markup.cpp
WebCore/platform/DeprecatedStringList.cpp [deleted file]
WebCore/platform/DeprecatedStringList.h [deleted file]
WebCore/platform/mac/DeprecatedStringListMac.mm [deleted file]

index 59aa933aeddc545ad472c342f21e2248194ce3b0..afcf56709c6ff965d6fe774fbc4aa62a8a2c1aa1 100644 (file)
@@ -1,3 +1,19 @@
+2008-02-18  Darin Adler  <darin@apple.com>
+
+        Reviewed and landed by Sam.
+
+        Remove DeprecatedStringList.
+
+        * GNUmakefile.am:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * WebCoreSources.bkl:
+        * editing/markup.cpp:
+        * platform/DeprecatedStringList.cpp: Removed.
+        * platform/DeprecatedStringList.h: Removed.
+        * platform/mac/DeprecatedStringListMac.mm: Removed.
+
 2008-02-18  Darin Adler  <darin@apple.com>
 
         Reviewed by Sam.
index 4428158b1f9f1b66d4a7b535bf0ce8f61488c796..0b65cb4bfe62c09059527e0eaea06d3f956dc7b5 100644 (file)
@@ -795,7 +795,6 @@ webcore_sources += \
        WebCore/platform/DeprecatedCString.cpp \
        WebCore/platform/DeprecatedPtrListImpl.cpp \
        WebCore/platform/DeprecatedString.cpp \
-       WebCore/platform/DeprecatedStringList.cpp \
        WebCore/platform/DeprecatedValueListImpl.cpp \
        WebCore/platform/DragData.cpp \
        WebCore/platform/DragImage.cpp \
index bab02a5d55138fb6cdcbe959677c3980d1595315..d811f4ca6214e19fe6d43b2872ff210cdc0ff7ff 100644 (file)
@@ -734,7 +734,6 @@ SOURCES += \
     platform/DeprecatedCString.cpp \
     platform/DeprecatedPtrListImpl.cpp \
     platform/DeprecatedString.cpp \
-    platform/DeprecatedStringList.cpp \
     platform/DeprecatedValueListImpl.cpp \
     platform/DragData.cpp \
     platform/DragImage.cpp \
index 1a05aa3d322f55789dbb8107b528b0517998675e..ce14d77764e6094f832dffe0bf500fcc4111f4df 100644 (file)
                                RelativePath="..\platform\DeprecatedString.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\platform\DeprecatedStringList.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\platform\DeprecatedStringList.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\platform\DeprecatedValueList.h"\r
                                >\r
index 22cf0ed9b023c86ea91c525b2c31a8415fa9dd8f..a3e5ff37a1430c4ed804214635fa59160daeb6b9 100644 (file)
                5DFE8F570D16477C0076E937 /* ScheduledAction.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA378BB0D15F64200B793D6 /* ScheduledAction.h */; };
                650F53DC09D15DDA00C9B0C8 /* CSSGrammar.h in Headers */ = {isa = PBXBuildFile; fileRef = 650F53DB09D15DDA00C9B0C8 /* CSSGrammar.h */; };
                650F53DD09D15DDF00C9B0C8 /* CSSGrammar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6565814409D13043000E61D7 /* CSSGrammar.cpp */; };
-               651B4D8509AC83370029F1EF /* DeprecatedStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 651B4D8309AC83370029F1EF /* DeprecatedStringList.cpp */; };
-               651B4D8609AC83370029F1EF /* DeprecatedStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = 651B4D8409AC83370029F1EF /* DeprecatedStringList.h */; };
-               651B4D8F09AC859F0029F1EF /* DeprecatedStringListMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 651B4D8E09AC859F0029F1EF /* DeprecatedStringListMac.mm */; };
                654EC611097778F500DAB52C /* WebCoreFrameBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 654EC60F097778F500DAB52C /* WebCoreFrameBridge.h */; settings = {ATTRIBUTES = (Private, ); }; };
                654EC612097778F500DAB52C /* WebCoreFrameBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 654EC610097778F500DAB52C /* WebCoreFrameBridge.mm */; };
                6550B69D099DF0270090D781 /* CDATASection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6550B693099DF0270090D781 /* CDATASection.cpp */; };
                55998A5D052B59CC0017A6C1 /* AXObjectCacheMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AXObjectCacheMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                5DCF836C0D59159800953BC6 /* PluginInfoStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginInfoStore.h; sourceTree = "<group>"; };
                650F53DB09D15DDA00C9B0C8 /* CSSGrammar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSGrammar.h; sourceTree = "<group>"; };
-               651B4D8309AC83370029F1EF /* DeprecatedStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedStringList.cpp; sourceTree = "<group>"; };
-               651B4D8409AC83370029F1EF /* DeprecatedStringList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DeprecatedStringList.h; sourceTree = "<group>"; };
-               651B4D8E09AC859F0029F1EF /* DeprecatedStringListMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DeprecatedStringListMac.mm; sourceTree = "<group>"; };
                6548E24809E1E04D00AF8020 /* Document.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Document.idl; sourceTree = "<group>"; };
                654EC60F097778F500DAB52C /* WebCoreFrameBridge.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreFrameBridge.h; sourceTree = "<group>"; };
                654EC610097778F500DAB52C /* WebCoreFrameBridge.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreFrameBridge.mm; sourceTree = "<group>"; };
                                93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */,
                                9352087609BD453400F2038D /* CookieJar.mm */,
                                F58784F002DE375901EA4122 /* CursorMac.mm */,
-                               651B4D8E09AC859F0029F1EF /* DeprecatedStringListMac.mm */,
                                6582A17709999EA000BEEB6D /* DeprecatedStringMac.mm */,
                                A795463D0B5C4C80007B438F /* DragDataMac.mm */,
                                A7CFB3D40B7ED1180070C32D /* DragImageMac.mm */,
                                F58786AD02DE3B8601EA4122 /* DeprecatedPtrQueue.h */,
                                6582A13D09999CD600BEEB6D /* DeprecatedString.cpp */,
                                6582A13E09999CD600BEEB6D /* DeprecatedString.h */,
-                               651B4D8309AC83370029F1EF /* DeprecatedStringList.cpp */,
-                               651B4D8409AC83370029F1EF /* DeprecatedStringList.h */,
                                F58786C202DE3B8601EA4122 /* DeprecatedValueList.h */,
                                F587853C02DE375901EA4122 /* DeprecatedValueListImpl.cpp */,
                                F587853B02DE375901EA4122 /* DeprecatedValueListImpl.h */,
                                93F1996D08245E59001E9ABC /* DeprecatedPtrListImpl.h in Headers */,
                                93F1998308245E59001E9ABC /* DeprecatedPtrQueue.h in Headers */,
                                6582A14009999CD600BEEB6D /* DeprecatedString.h in Headers */,
-                               651B4D8609AC83370029F1EF /* DeprecatedStringList.h in Headers */,
                                93F1999D08245E59001E9ABC /* DeprecatedValueList.h in Headers */,
                                93F1999E08245E59001E9ABC /* DeprecatedValueListImpl.h in Headers */,
                                BCB16C2A0979C3BD00467741 /* DocLoader.h in Headers */,
                                93F19A1808245E59001E9ABC /* DeprecatedCString.cpp in Sources */,
                                93F19A3C08245E59001E9ABC /* DeprecatedPtrListImpl.cpp in Sources */,
                                6582A13F09999CD600BEEB6D /* DeprecatedString.cpp in Sources */,
-                               651B4D8509AC83370029F1EF /* DeprecatedStringList.cpp in Sources */,
-                               651B4D8F09AC859F0029F1EF /* DeprecatedStringListMac.mm in Sources */,
                                6582A17809999EA000BEEB6D /* DeprecatedStringMac.mm in Sources */,
                                93F19A5608245E59001E9ABC /* DeprecatedValueListImpl.cpp in Sources */,
                                BCB16C290979C3BD00467741 /* DocLoader.cpp in Sources */,
index 750e3ac7ababccb5b2cad26c4ad01576e235813d..34f5d2234452136221e053ad4063d328bdf2b4c1 100644 (file)
@@ -567,7 +567,6 @@ This file contains the list of files needed to build WebCore.
         platform/DeprecatedCString.cpp
         platform/DeprecatedPtrListImpl.cpp
         platform/DeprecatedString.cpp
-        platform/DeprecatedStringList.cpp
         platform/DeprecatedValueListImpl.cpp
         platform/DragImage.cpp
         platform/FileChooser.cpp
index 66425a14f1c0e6101955d3375e3422f6bccc2c81..1af223deef4b3586dc0d6c12a9f97e754d556e1e 100644 (file)
@@ -36,7 +36,6 @@
 #include "CSSValueKeywords.h"
 #include "Comment.h"
 #include "DeleteButtonController.h"
-#include "DeprecatedStringList.h"
 #include "Document.h"
 #include "DocumentFragment.h"
 #include "DocumentType.h"
diff --git a/WebCore/platform/DeprecatedStringList.cpp b/WebCore/platform/DeprecatedStringList.cpp
deleted file mode 100644 (file)
index ee82221..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-#include "DeprecatedStringList.h"
-
-namespace WebCore {
-
-DeprecatedStringList DeprecatedStringList::split(const DeprecatedString &separator, const DeprecatedString &s, bool allowEmptyEntries)
-{
-    DeprecatedStringList result;
-
-    int startPos = 0;
-    int endPos;
-    while ((endPos = s.find(separator, startPos)) != -1) {
-        if (allowEmptyEntries || startPos != endPos)
-            result.append(s.mid(startPos, endPos - startPos));
-        startPos = endPos + separator.length();
-    }
-    if (allowEmptyEntries || startPos != (int)s.length())
-        result.append(s.mid(startPos));
-            
-    return result;
-}
-DeprecatedStringList DeprecatedStringList::split(const DeprecatedChar &separator, const DeprecatedString &s, bool allowEmptyEntries)
-{
-    return DeprecatedStringList::split(DeprecatedString(separator), s, allowEmptyEntries);
-}
-
-DeprecatedString DeprecatedStringList::join(const DeprecatedString &separator) const
-{
-    DeprecatedString result;
-    
-    for (ConstIterator i = begin(), j = ++begin(); i != end(); ++i, ++j) {
-        result += *i;
-        if (j != end()) {
-            result += separator;
-        }
-    }
-
-    return result;
-}
-
-DeprecatedString DeprecatedStringList::pop_front()
-{
-    DeprecatedString front = first();
-    remove(begin());
-    return front;
-}
-
-}
diff --git a/WebCore/platform/DeprecatedStringList.h b/WebCore/platform/DeprecatedStringList.h
deleted file mode 100644 (file)
index aa735bf..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef DeprecatedStringList_h
-#define DeprecatedStringList_h
-
-#include "DeprecatedString.h"
-#include "DeprecatedValueList.h"
-
-#ifdef __OBJC__
-@class NSArray;
-#endif
-
-namespace WebCore {
-
-class DeprecatedStringList : public DeprecatedValueList<DeprecatedString> {
-public:
-    static DeprecatedStringList split(const DeprecatedString &, const DeprecatedString &, bool allowEmptyEntries = false);
-    static DeprecatedStringList split(const DeprecatedChar &, const DeprecatedString &, bool allowEmptyEntries = false);
-
-    DeprecatedString join(const DeprecatedString &) const;
-    
-    DeprecatedString pop_front();
-    
-#ifdef __OBJC__
-    NSArray *getNSArray() const;
-#endif
-};
-
-}
-
-#endif
diff --git a/WebCore/platform/mac/DeprecatedStringListMac.mm b/WebCore/platform/mac/DeprecatedStringListMac.mm
deleted file mode 100644 (file)
index abb6329..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-#import "DeprecatedStringList.h"
-
-namespace WebCore {
-
-NSArray *DeprecatedStringList::getNSArray() const
-{
-    NSMutableArray *array = [NSMutableArray array];
-    for (ConstIterator it = begin(); it != end(); ++it) {
-        [array addObject:(*it).getNSString()];
-    }
-    return array;
-}
-
-}