Reviewed by Geoff.
- move QStringList to platform, make it portable
* ForwardingHeaders/qstringlist.h: Removed.
* WebCore.vcproj/WebCore/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* dom/DocumentImpl.h:
* kcanvas/KCanvasFilters.h:
* khtml/xbl/xbl_protohandler.cpp:
* ksvg2/svg/SVGColorImpl.cpp:
* ksvg2/svg/SVGComponentTransferFunctionElementImpl.cpp:
* ksvg2/svg/SVGDOMImplementationImpl.h:
* ksvg2/svg/SVGFEBlendElementImpl.cpp:
* ksvg2/svg/SVGFEColorMatrixElementImpl.cpp:
* ksvg2/svg/SVGFEComponentTransferElementImpl.cpp:
* ksvg2/svg/SVGFECompositeElementImpl.cpp:
* ksvg2/svg/SVGFEDiffuseLightingElementImpl.cpp:
* ksvg2/svg/SVGFEDisplacementMapElementImpl.cpp:
* ksvg2/svg/SVGFEFloodElementImpl.cpp:
* ksvg2/svg/SVGFEGaussianBlurElementImpl.cpp:
* ksvg2/svg/SVGFELightElementImpl.cpp:
* ksvg2/svg/SVGFEMergeElementImpl.cpp:
* ksvg2/svg/SVGFEOffsetElementImpl.cpp:
* ksvg2/svg/SVGFESpecularLightingElementImpl.cpp:
* ksvg2/svg/SVGFETileElementImpl.cpp:
* ksvg2/svg/SVGFETurbulenceElementImpl.cpp:
* ksvg2/svg/SVGFitToViewBoxImpl.cpp:
* ksvg2/svg/SVGLengthListImpl.cpp:
* ksvg2/svg/SVGNumberListImpl.cpp:
* ksvg2/svg/SVGPreserveAspectRatioImpl.cpp:
* ksvg2/svg/SVGStringListImpl.cpp:
* ksvg2/svg/SVGStyledTransformableElementImpl.cpp:
* ksvg2/svg/SVGTransformableImpl.cpp:
* kwq/KWQClipboard.mm:
* kwq/KWQKConfigBase.mm:
* kwq/KWQKHTMLSettings.h:
* kwq/KWQKLocale.h:
* kwq/KWQKSSLKeyGen.h:
* kwq/KWQStringList.h: Removed.
* kwq/KWQStringList.mm: Removed.
* loader/DocLoader.h:
* page/Frame.h:
* platform/QStringList.cpp: Added.
(QStringList::split):
(QStringList::pop_front):
* platform/QStringList.h: Added.
* platform/mac/QStringListMac.mm: Added.
(QStringList::getNSArray):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@12932 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 82d22b4..718f29e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,55 @@
+2006-02-22 Maciej Stachowiak <mjs@apple.com>
+
+ Reviewed by Geoff.
+
+ - move QStringList to platform, make it portable
+
+ * ForwardingHeaders/qstringlist.h: Removed.
+ * WebCore.vcproj/WebCore/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/DocumentImpl.h:
+ * kcanvas/KCanvasFilters.h:
+ * khtml/xbl/xbl_protohandler.cpp:
+ * ksvg2/svg/SVGColorImpl.cpp:
+ * ksvg2/svg/SVGComponentTransferFunctionElementImpl.cpp:
+ * ksvg2/svg/SVGDOMImplementationImpl.h:
+ * ksvg2/svg/SVGFEBlendElementImpl.cpp:
+ * ksvg2/svg/SVGFEColorMatrixElementImpl.cpp:
+ * ksvg2/svg/SVGFEComponentTransferElementImpl.cpp:
+ * ksvg2/svg/SVGFECompositeElementImpl.cpp:
+ * ksvg2/svg/SVGFEDiffuseLightingElementImpl.cpp:
+ * ksvg2/svg/SVGFEDisplacementMapElementImpl.cpp:
+ * ksvg2/svg/SVGFEFloodElementImpl.cpp:
+ * ksvg2/svg/SVGFEGaussianBlurElementImpl.cpp:
+ * ksvg2/svg/SVGFELightElementImpl.cpp:
+ * ksvg2/svg/SVGFEMergeElementImpl.cpp:
+ * ksvg2/svg/SVGFEOffsetElementImpl.cpp:
+ * ksvg2/svg/SVGFESpecularLightingElementImpl.cpp:
+ * ksvg2/svg/SVGFETileElementImpl.cpp:
+ * ksvg2/svg/SVGFETurbulenceElementImpl.cpp:
+ * ksvg2/svg/SVGFitToViewBoxImpl.cpp:
+ * ksvg2/svg/SVGLengthListImpl.cpp:
+ * ksvg2/svg/SVGNumberListImpl.cpp:
+ * ksvg2/svg/SVGPreserveAspectRatioImpl.cpp:
+ * ksvg2/svg/SVGStringListImpl.cpp:
+ * ksvg2/svg/SVGStyledTransformableElementImpl.cpp:
+ * ksvg2/svg/SVGTransformableImpl.cpp:
+ * kwq/KWQClipboard.mm:
+ * kwq/KWQKConfigBase.mm:
+ * kwq/KWQKHTMLSettings.h:
+ * kwq/KWQKLocale.h:
+ * kwq/KWQKSSLKeyGen.h:
+ * kwq/KWQStringList.h: Removed.
+ * kwq/KWQStringList.mm: Removed.
+ * loader/DocLoader.h:
+ * page/Frame.h:
+ * platform/QStringList.cpp: Added.
+ (QStringList::split):
+ (QStringList::pop_front):
+ * platform/QStringList.h: Added.
+ * platform/mac/QStringListMac.mm: Added.
+ (QStringList::getNSArray):
+
2006-02-21 Adele Peterson <adele@apple.com>
Reviewed by Hyatt.
diff --git a/WebCore/ForwardingHeaders/qstringlist.h b/WebCore/ForwardingHeaders/qstringlist.h
deleted file mode 100644
index e398e43..0000000
--- a/WebCore/ForwardingHeaders/qstringlist.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "KWQStringList.h"
diff --git a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
index f6c0b11..ee15bdd 100644
--- a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
@@ -1629,6 +1629,14 @@
>
</File>
<File
+ RelativePath="..\..\platform\QStringList.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\platform\QStringList.h"
+ >
+ </File>
+ <File
RelativePath="..\..\platform\Screen.h"
>
</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 2ee4771..a4b10a6 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -15,6 +15,9 @@
550A0BCA085F6039007353D6 /* dom_qname.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* dom_qname.h */; };
550A0BCD085F604D007353D6 /* htmlnames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 550A0BCB085F604D007353D6 /* htmlnames.cpp */; };
550A0BCE085F604D007353D6 /* htmlnames.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BCC085F604D007353D6 /* htmlnames.h */; };
+ 651B4D8509AC83370029F1EF /* QStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 651B4D8309AC83370029F1EF /* QStringList.cpp */; };
+ 651B4D8609AC83370029F1EF /* QStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = 651B4D8409AC83370029F1EF /* QStringList.h */; };
+ 651B4D8F09AC859F0029F1EF /* QStringListMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 651B4D8E09AC859F0029F1EF /* QStringListMac.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 /* CDATASectionImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6550B693099DF0270090D781 /* CDATASectionImpl.cpp */; };
@@ -246,7 +249,6 @@
93F1998E08245E59001E9ABC /* KWQScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786B502DE3B8601EA4122 /* KWQScrollView.h */; };
93F1998F08245E59001E9ABC /* KWQSignal.h in Headers */ = {isa = PBXBuildFile; fileRef = F5117BC902F9FFEF018635CE /* KWQSignal.h */; };
93F1999108245E59001E9ABC /* KWQSlot.h in Headers */ = {isa = PBXBuildFile; fileRef = F5117BCB02F9FFEF018635CE /* KWQSlot.h */; };
- 93F1999408245E59001E9ABC /* KWQStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786BA02DE3B8601EA4122 /* KWQStringList.h */; };
93F1999708245E59001E9ABC /* KWQTextArea.h in Headers */ = {isa = PBXBuildFile; fileRef = F587853502DE375901EA4122 /* KWQTextArea.h */; };
93F1999808245E59001E9ABC /* KWQTextCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786BD02DE3B8601EA4122 /* KWQTextCodec.h */; };
93F1999908245E59001E9ABC /* KWQTextEdit.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786BE02DE3B8601EA4122 /* KWQTextEdit.h */; };
@@ -337,7 +339,6 @@
93F19A4A08245E59001E9ABC /* KWQRegExp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587852B02DE375901EA4122 /* KWQRegExp.cpp */; };
93F19A4B08245E59001E9ABC /* KWQRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587852C02DE375901EA4122 /* KWQRegion.cpp */; };
93F19A4C08245E59001E9ABC /* KWQScrollView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587852E02DE375901EA4122 /* KWQScrollView.mm */; };
- 93F19A5008245E59001E9ABC /* KWQStringList.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853202DE375901EA4122 /* KWQStringList.mm */; };
93F19A5108245E59001E9ABC /* KWQTextArea.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853602DE375901EA4122 /* KWQTextArea.mm */; };
93F19A5208245E59001E9ABC /* KWQTextCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587853702DE375901EA4122 /* KWQTextCodec.cpp */; };
93F19A5308245E59001E9ABC /* KWQTextEdit.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853802DE375901EA4122 /* KWQTextEdit.mm */; };
@@ -1114,6 +1115,9 @@
55998A5B052B59CC0017A6C1 /* KWQAccObject.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQAccObject.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
55998A5C052B59CC0017A6C1 /* KWQAccObjectCache.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQAccObjectCache.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
55998A5D052B59CC0017A6C1 /* KWQAccObjectCache.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQAccObjectCache.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+ 651B4D8309AC83370029F1EF /* QStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = QStringList.cpp; path = platform/QStringList.cpp; sourceTree = "<group>"; };
+ 651B4D8409AC83370029F1EF /* QStringList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QStringList.h; path = platform/QStringList.h; sourceTree = "<group>"; };
+ 651B4D8E09AC859F0029F1EF /* QStringListMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = QStringListMac.mm; 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>"; };
6550B693099DF0270090D781 /* CDATASectionImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CDATASectionImpl.cpp; sourceTree = "<group>"; };
@@ -2190,7 +2194,6 @@
F587852B02DE375901EA4122 /* KWQRegExp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQRegExp.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587852C02DE375901EA4122 /* KWQRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQRegion.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587852E02DE375901EA4122 /* KWQScrollView.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQScrollView.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F587853202DE375901EA4122 /* KWQStringList.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQStringList.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587853502DE375901EA4122 /* KWQTextArea.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQTextArea.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587853602DE375901EA4122 /* KWQTextArea.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQTextArea.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587853702DE375901EA4122 /* KWQTextCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQTextCodec.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -2244,7 +2247,6 @@
F58786B302DE3B8601EA4122 /* KWQRegExp.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQRegExp.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58786B402DE3B8601EA4122 /* KWQRegion.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQRegion.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58786B502DE3B8601EA4122 /* KWQScrollView.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQScrollView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F58786BA02DE3B8601EA4122 /* KWQStringList.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQStringList.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58786BD02DE3B8601EA4122 /* KWQTextCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQTextCodec.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58786BE02DE3B8601EA4122 /* KWQTextEdit.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQTextEdit.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58786BF02DE3B8601EA4122 /* KWQTextStream.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQTextStream.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -2372,6 +2374,7 @@
6582A15209999D6D00BEEB6D /* PDFDocumentImage.h */,
6582A15309999D6D00BEEB6D /* PDFDocumentImage.mm */,
6582A17709999EA000BEEB6D /* QStringMac.mm */,
+ 651B4D8E09AC859F0029F1EF /* QStringListMac.mm */,
6582A15409999D6D00BEEB6D /* ScreenMac.mm */,
93309E9F099EB78C0056E581 /* SharedTimerMac.cpp */,
6582A15509999D6D00BEEB6D /* SystemTimeMac.cpp */,
@@ -3292,6 +3295,8 @@
93CD4FEB0995FD2A007ECC97 /* PlatformString.h */,
6582A13D09999CD600BEEB6D /* QString.cpp */,
6582A13E09999CD600BEEB6D /* QString.h */,
+ 651B4D8309AC83370029F1EF /* QStringList.cpp */,
+ 651B4D8409AC83370029F1EF /* QStringList.h */,
9385F761098D9C3100D90D24 /* Screen.h */,
BCFB2F3F097A24B500BA703D /* SegmentedString.cpp */,
BCFB2F40097A24B500BA703D /* SegmentedString.h */,
@@ -3839,8 +3844,6 @@
BC86FB8E061F5C23006BB822 /* KWQSlider.mm */,
F5117BCC02F9FFEF018635CE /* KWQSlot.cpp */,
F5117BCB02F9FFEF018635CE /* KWQSlot.h */,
- F58786BA02DE3B8601EA4122 /* KWQStringList.h */,
- F587853202DE375901EA4122 /* KWQStringList.mm */,
F587853702DE375901EA4122 /* KWQTextCodec.cpp */,
F58786BD02DE3B8601EA4122 /* KWQTextCodec.h */,
F58786BE02DE3B8601EA4122 /* KWQTextEdit.h */,
@@ -3946,7 +3949,6 @@
93F1998E08245E59001E9ABC /* KWQScrollView.h in Headers */,
93F1998F08245E59001E9ABC /* KWQSignal.h in Headers */,
93F1999108245E59001E9ABC /* KWQSlot.h in Headers */,
- 93F1999408245E59001E9ABC /* KWQStringList.h in Headers */,
93F1999708245E59001E9ABC /* KWQTextArea.h in Headers */,
93F1999808245E59001E9ABC /* KWQTextCodec.h in Headers */,
93F1999908245E59001E9ABC /* KWQTextEdit.h in Headers */,
@@ -4385,6 +4387,7 @@
9380F47409A11AB4001FDB34 /* Widget.h in Headers */,
ED2BA83C09A24B91006C0AC4 /* DocumentMarker.h in Headers */,
BCC47E2709A3D6F100ADB771 /* FontFamily.h in Headers */,
+ 651B4D8609AC83370029F1EF /* QStringList.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5043,7 +5046,6 @@
93F19A4A08245E59001E9ABC /* KWQRegExp.cpp in Sources */,
93F19A4B08245E59001E9ABC /* KWQRegion.cpp in Sources */,
93F19A4C08245E59001E9ABC /* KWQScrollView.mm in Sources */,
- 93F19A5008245E59001E9ABC /* KWQStringList.mm in Sources */,
93F19A5108245E59001E9ABC /* KWQTextArea.mm in Sources */,
93F19A5208245E59001E9ABC /* KWQTextCodec.cpp in Sources */,
93F19A5308245E59001E9ABC /* KWQTextEdit.mm in Sources */,
@@ -5494,6 +5496,8 @@
9380F68709A143B2001FDB34 /* FrameViewMac.mm in Sources */,
BCC47E2309A3D6B300ADB771 /* FontFamilyMac.mm in Sources */,
BCC47E2609A3D6F100ADB771 /* FontFamily.cpp in Sources */,
+ 651B4D8509AC83370029F1EF /* QStringList.cpp in Sources */,
+ 651B4D8F09AC859F0029F1EF /* QStringListMac.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebCore/dom/DocumentImpl.h b/WebCore/dom/DocumentImpl.h
index d6f0b3f..c4e76f7 100644
--- a/WebCore/dom/DocumentImpl.h
+++ b/WebCore/dom/DocumentImpl.h
@@ -39,7 +39,7 @@
#include <kxmlcore/HashMap.h>
#include <qobject.h>
#include <qptrlist.h>
-#include <qstringlist.h>
+#include <QStringList.h>
class KWQAccObjectCache;
class RenderArena;
diff --git a/WebCore/kcanvas/KCanvasFilters.h b/WebCore/kcanvas/KCanvasFilters.h
index ac660dd..23b40ea 100644
--- a/WebCore/kcanvas/KCanvasFilters.h
+++ b/WebCore/kcanvas/KCanvasFilters.h
@@ -28,7 +28,7 @@
#include "KCanvasResources.h"
#include "FloatSize.h"
#include "Color.h"
-#include <qstringlist.h>
+#include <QStringList.h>
#ifdef __OBJC__
@class CIFilter;
diff --git a/WebCore/khtml/xbl/xbl_protohandler.cpp b/WebCore/khtml/xbl/xbl_protohandler.cpp
index b1ce3ac..97d0d79 100644
--- a/WebCore/khtml/xbl/xbl_protohandler.cpp
+++ b/WebCore/khtml/xbl/xbl_protohandler.cpp
@@ -1,7 +1,7 @@
#ifndef KHTML_NO_XBL
#include "config.h"
-#include "qstringlist.h"
+#include "QStringList.h"
#include "QString.h"
#include "xbl_protohandler.h"
diff --git a/WebCore/ksvg2/svg/SVGColorImpl.cpp b/WebCore/ksvg2/svg/SVGColorImpl.cpp
index 435fbd3..e18e213 100644
--- a/WebCore/ksvg2/svg/SVGColorImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGColorImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include "css_valueimpl.h"
diff --git a/WebCore/ksvg2/svg/SVGComponentTransferFunctionElementImpl.cpp b/WebCore/ksvg2/svg/SVGComponentTransferFunctionElementImpl.cpp
index 1af0433..59b9e82 100644
--- a/WebCore/ksvg2/svg/SVGComponentTransferFunctionElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGComponentTransferFunctionElementImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGDOMImplementationImpl.h b/WebCore/ksvg2/svg/SVGDOMImplementationImpl.h
index b6e4f56..7ea797e 100644
--- a/WebCore/ksvg2/svg/SVGDOMImplementationImpl.h
+++ b/WebCore/ksvg2/svg/SVGDOMImplementationImpl.h
@@ -25,7 +25,7 @@
#if SVG_SUPPORT
#include "DOMImplementationImpl.h"
-#include <qstringlist.h>
+#include <QStringList.h>
namespace WebCore
{
diff --git a/WebCore/ksvg2/svg/SVGFEBlendElementImpl.cpp b/WebCore/ksvg2/svg/SVGFEBlendElementImpl.cpp
index d25066a..0ab0227 100644
--- a/WebCore/ksvg2/svg/SVGFEBlendElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFEBlendElementImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFEColorMatrixElementImpl.cpp b/WebCore/ksvg2/svg/SVGFEColorMatrixElementImpl.cpp
index f848092..d95fcdc 100644
--- a/WebCore/ksvg2/svg/SVGFEColorMatrixElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFEColorMatrixElementImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFEComponentTransferElementImpl.cpp b/WebCore/ksvg2/svg/SVGFEComponentTransferElementImpl.cpp
index 2a0b5b2..7ad54c5 100644
--- a/WebCore/ksvg2/svg/SVGFEComponentTransferElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFEComponentTransferElementImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFECompositeElementImpl.cpp b/WebCore/ksvg2/svg/SVGFECompositeElementImpl.cpp
index dd85600..493cac8 100644
--- a/WebCore/ksvg2/svg/SVGFECompositeElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFECompositeElementImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFEDiffuseLightingElementImpl.cpp b/WebCore/ksvg2/svg/SVGFEDiffuseLightingElementImpl.cpp
index dee8f59..e6aa3c8 100644
--- a/WebCore/ksvg2/svg/SVGFEDiffuseLightingElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFEDiffuseLightingElementImpl.cpp
@@ -19,7 +19,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFEDisplacementMapElementImpl.cpp b/WebCore/ksvg2/svg/SVGFEDisplacementMapElementImpl.cpp
index 542a5ca..4ce3d63 100644
--- a/WebCore/ksvg2/svg/SVGFEDisplacementMapElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFEDisplacementMapElementImpl.cpp
@@ -20,7 +20,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFEFloodElementImpl.cpp b/WebCore/ksvg2/svg/SVGFEFloodElementImpl.cpp
index 00dab4c..a8bdbb6 100644
--- a/WebCore/ksvg2/svg/SVGFEFloodElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFEFloodElementImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFEGaussianBlurElementImpl.cpp b/WebCore/ksvg2/svg/SVGFEGaussianBlurElementImpl.cpp
index 3310e17..b59e904 100644
--- a/WebCore/ksvg2/svg/SVGFEGaussianBlurElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFEGaussianBlurElementImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFELightElementImpl.cpp b/WebCore/ksvg2/svg/SVGFELightElementImpl.cpp
index b41bd57..9aa52df 100644
--- a/WebCore/ksvg2/svg/SVGFELightElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFELightElementImpl.cpp
@@ -21,7 +21,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFEMergeElementImpl.cpp b/WebCore/ksvg2/svg/SVGFEMergeElementImpl.cpp
index b986c9e..8e7c119 100644
--- a/WebCore/ksvg2/svg/SVGFEMergeElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFEMergeElementImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFEOffsetElementImpl.cpp b/WebCore/ksvg2/svg/SVGFEOffsetElementImpl.cpp
index 7b24271..30e9a64 100644
--- a/WebCore/ksvg2/svg/SVGFEOffsetElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFEOffsetElementImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFESpecularLightingElementImpl.cpp b/WebCore/ksvg2/svg/SVGFESpecularLightingElementImpl.cpp
index a4515c5..feb3c75 100644
--- a/WebCore/ksvg2/svg/SVGFESpecularLightingElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFESpecularLightingElementImpl.cpp
@@ -21,7 +21,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFETileElementImpl.cpp b/WebCore/ksvg2/svg/SVGFETileElementImpl.cpp
index 5107373..9c65e2c 100644
--- a/WebCore/ksvg2/svg/SVGFETileElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFETileElementImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFETurbulenceElementImpl.cpp b/WebCore/ksvg2/svg/SVGFETurbulenceElementImpl.cpp
index ed18a2f..379a759 100644
--- a/WebCore/ksvg2/svg/SVGFETurbulenceElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFETurbulenceElementImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGFitToViewBoxImpl.cpp b/WebCore/ksvg2/svg/SVGFitToViewBoxImpl.cpp
index 5a0b7fc..746081e 100644
--- a/WebCore/ksvg2/svg/SVGFitToViewBoxImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGFitToViewBoxImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
#include "StringImpl.h"
diff --git a/WebCore/ksvg2/svg/SVGLengthListImpl.cpp b/WebCore/ksvg2/svg/SVGLengthListImpl.cpp
index 2fe974a..9f2286d 100644
--- a/WebCore/ksvg2/svg/SVGLengthListImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGLengthListImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include "SVGMatrixImpl.h"
#include "SVGSVGElementImpl.h"
diff --git a/WebCore/ksvg2/svg/SVGNumberListImpl.cpp b/WebCore/ksvg2/svg/SVGNumberListImpl.cpp
index 4676db2..a3e6443 100644
--- a/WebCore/ksvg2/svg/SVGNumberListImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGNumberListImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include "SVGMatrixImpl.h"
#include "SVGNumberImpl.h"
diff --git a/WebCore/ksvg2/svg/SVGPreserveAspectRatioImpl.cpp b/WebCore/ksvg2/svg/SVGPreserveAspectRatioImpl.cpp
index bfc2894..c38b5e5 100644
--- a/WebCore/ksvg2/svg/SVGPreserveAspectRatioImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGPreserveAspectRatioImpl.cpp
@@ -23,7 +23,7 @@
#include "config.h"
#if SVG_SUPPORT
#include <QString.h>
-#include <qstringlist.h>
+#include <QStringList.h>
#include "StringImpl.h"
diff --git a/WebCore/ksvg2/svg/SVGStringListImpl.cpp b/WebCore/ksvg2/svg/SVGStringListImpl.cpp
index 8b7a018..8d89d7f 100644
--- a/WebCore/ksvg2/svg/SVGStringListImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGStringListImpl.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#if SVG_SUPPORT
-#include <qstringlist.h>
+#include <QStringList.h>
#include "SVGStringListImpl.h"
diff --git a/WebCore/ksvg2/svg/SVGStyledTransformableElementImpl.cpp b/WebCore/ksvg2/svg/SVGStyledTransformableElementImpl.cpp
index 56e29cb..a5e28a8 100644
--- a/WebCore/ksvg2/svg/SVGStyledTransformableElementImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGStyledTransformableElementImpl.cpp
@@ -23,7 +23,7 @@
#include "config.h"
#if SVG_SUPPORT
#include <qregexp.h>
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/ksvg2/svg/SVGTransformableImpl.cpp b/WebCore/ksvg2/svg/SVGTransformableImpl.cpp
index 9052103..d2dd166 100644
--- a/WebCore/ksvg2/svg/SVGTransformableImpl.cpp
+++ b/WebCore/ksvg2/svg/SVGTransformableImpl.cpp
@@ -23,7 +23,7 @@
#include "config.h"
#if SVG_SUPPORT
#include <qregexp.h>
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kxmlcore/RefPtr.h>
#include <kdom/core/AttrImpl.h>
diff --git a/WebCore/kwq/KWQClipboard.mm b/WebCore/kwq/KWQClipboard.mm
index 812df52..14cae5c 100644
--- a/WebCore/kwq/KWQClipboard.mm
+++ b/WebCore/kwq/KWQClipboard.mm
@@ -28,7 +28,7 @@
#import <kxmlcore/Assertions.h>
#import "KWQFoundationExtras.h"
#import "MacFrame.h"
-#import "KWQStringList.h"
+#import "QStringList.h"
#import "WebCoreGraphicsBridge.h"
#import "WebCoreImageRenderer.h"
#import "CachedImage.h"
diff --git a/WebCore/kwq/KWQKConfigBase.mm b/WebCore/kwq/KWQKConfigBase.mm
index 7a459c3..b8f5010 100644
--- a/WebCore/kwq/KWQKConfigBase.mm
+++ b/WebCore/kwq/KWQKConfigBase.mm
@@ -30,7 +30,7 @@
#import "KWQExceptions.h"
#import "KWQKHTMLSettings.h"
#import "KWQLogging.h"
-#import "KWQStringList.h"
+#import "QStringList.h"
#import "WebCoreSettings.h"
#import "WebCoreViewFactory.h"
diff --git a/WebCore/kwq/KWQKHTMLSettings.h b/WebCore/kwq/KWQKHTMLSettings.h
index 69209ce..4cc66a4b 100644
--- a/WebCore/kwq/KWQKHTMLSettings.h
+++ b/WebCore/kwq/KWQKHTMLSettings.h
@@ -27,7 +27,7 @@
#define KHTML_SETTINGS_H_
#include "QString.h"
-#include "KWQStringList.h"
+#include "QStringList.h"
#include "KWQFont.h"
class KHTMLSettings
diff --git a/WebCore/kwq/KWQKLocale.h b/WebCore/kwq/KWQKLocale.h
index ae47228..0181241 100644
--- a/WebCore/kwq/KWQKLocale.h
+++ b/WebCore/kwq/KWQKLocale.h
@@ -26,7 +26,7 @@
#ifndef KLOCALE_H_
#define KLOCALE_H_
-#include "KWQStringList.h"
+#include "QStringList.h"
QString inputElementAltText();
QString resetButtonDefaultLabel();
diff --git a/WebCore/kwq/KWQKSSLKeyGen.h b/WebCore/kwq/KWQKSSLKeyGen.h
index 22ebba1..42c378b 100644
--- a/WebCore/kwq/KWQKSSLKeyGen.h
+++ b/WebCore/kwq/KWQKSSLKeyGen.h
@@ -26,7 +26,7 @@
#ifndef KSSLKEYGEN_H_
#define KSSLKEYGEN_H_
-#include "KWQStringList.h"
+#include "QStringList.h"
class KURL;
diff --git a/WebCore/loader/DocLoader.h b/WebCore/loader/DocLoader.h
index 8e6bc4f..8a57bbe 100644
--- a/WebCore/loader/DocLoader.h
+++ b/WebCore/loader/DocLoader.h
@@ -30,7 +30,7 @@
#include <khtml_settings.h>
#include <kio/global.h>
#include <qptrlist.h>
-#include <qstringlist.h>
+#include <QStringList.h>
class KURL;
class KWQLoader;
diff --git a/WebCore/page/Frame.h b/WebCore/page/Frame.h
index 2414518..8182fd6 100644
--- a/WebCore/page/Frame.h
+++ b/WebCore/page/Frame.h
@@ -38,7 +38,7 @@
#include "text_granularity.h"
#include <kurl.h>
#include <qscrollbar.h>
-#include <qstringlist.h>
+#include <QStringList.h>
#include <kxmlcore/Noncopyable.h>
class KHTMLSettings;
diff --git a/WebCore/kwq/KWQStringList.mm b/WebCore/platform/QStringList.cpp
similarity index 68%
rename from WebCore/kwq/KWQStringList.mm
rename to WebCore/platform/QStringList.cpp
index 36b1602..46fd36e 100644
--- a/WebCore/kwq/KWQStringList.mm
+++ b/WebCore/platform/QStringList.cpp
@@ -24,38 +24,22 @@
*/
#include "config.h"
-#import "KWQStringList.h"
-
-#import <CoreFoundation/CoreFoundation.h>
-
-// No need to CFRelease return value
-static CFStringRef GetCFString(const QString &s)
-{
- CFStringRef cfs = s.getCFString();
- if (cfs == NULL) {
- cfs = CFSTR("");
- }
- return cfs;
-}
+#include "QStringList.h"
QStringList QStringList::split(const QString &separator, const QString &s, bool allowEmptyEntries)
{
- CFArrayRef cfresult;
QStringList result;
- cfresult = CFStringCreateArrayBySeparatingStrings(NULL, GetCFString(s), GetCFString(separator));
-
- CFIndex cfResultSize = CFArrayGetCount(cfresult);
-
- for (CFIndex i = 0; i < cfResultSize; i++) {
- QString entry = QString::fromCFString((CFStringRef)CFArrayGetValueAtIndex(cfresult, i));
- if (!entry.isEmpty() || allowEmptyEntries) {
- result.append(entry);
- }
+ 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();
}
-
- CFRelease(cfresult);
-
+ if (allowEmptyEntries || startPos != (int)s.length())
+ result.append(s.mid(startPos));
+
return result;
}
@@ -84,12 +68,3 @@
remove(begin());
return front;
}
-
-NSArray *QStringList::getNSArray() const
-{
- NSMutableArray *array = [NSMutableArray array];
- for (ConstIterator it = begin(); it != end(); ++it) {
- [array addObject:(*it).getNSString()];
- }
- return array;
-}
diff --git a/WebCore/kwq/KWQStringList.h b/WebCore/platform/QStringList.h
similarity index 97%
rename from WebCore/kwq/KWQStringList.h
rename to WebCore/platform/QStringList.h
index 106f717..9fcf43e 100644
--- a/WebCore/kwq/KWQStringList.h
+++ b/WebCore/platform/QStringList.h
@@ -29,11 +29,13 @@
#include "QString.h"
#include "KWQValueList.h"
+#ifdef __APPLE__
#ifdef __OBJC__
@class NSArray;
#else
class NSArray;
#endif
+#endif
class QStringList : public QValueList<QString> {
public:
@@ -44,7 +46,9 @@
QString pop_front();
+#ifdef __APPLE__
NSArray *getNSArray() const;
+#endif
};
#endif
diff --git a/WebCore/kwq/KWQStringList.h b/WebCore/platform/mac/QStringListMac.mm
similarity index 71%
copy from WebCore/kwq/KWQStringList.h
copy to WebCore/platform/mac/QStringListMac.mm
index 106f717..d790344a 100644
--- a/WebCore/kwq/KWQStringList.h
+++ b/WebCore/platform/mac/QStringListMac.mm
@@ -23,28 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QSTRINGLIST_H_
-#define QSTRINGLIST_H_
+#include "config.h"
+#import "QStringList.h"
-#include "QString.h"
-#include "KWQValueList.h"
-
-#ifdef __OBJC__
-@class NSArray;
-#else
-class NSArray;
-#endif
-
-class QStringList : public QValueList<QString> {
-public:
- static QStringList split(const QString &, const QString &, bool allowEmptyEntries = false);
- static QStringList split(const QChar &, const QString &, bool allowEmptyEntries = false);
-
- QString join(const QString &) const;
-
- QString pop_front();
-
- NSArray *getNSArray() const;
-};
-
-#endif
+NSArray *QStringList::getNSArray() const
+{
+ NSMutableArray *array = [NSMutableArray array];
+ for (ConstIterator it = begin(); it != end(); ++it) {
+ [array addObject:(*it).getNSString()];
+ }
+ return array;
+}
