Author: aldeck Date: Fri Jun 8 00:24:10 2012 New Revision: 589 URL: http://webpositive.haiku-os.org/changeset/589 Log: * Remove WebCore/platform/text/CString.h/cpp as should have been in r423. WebKit r56825 moved CString to JavaScriptCore/wtf * Remove unneeded includes * Jamfile: Put back local include path JavaScriptCore/wtf * Jamfile: Fix icu lib names Fixes build Deleted: webkit/trunk/WebCore/platform/text/CString.cpp webkit/trunk/WebCore/platform/text/CString.h Modified: webkit/trunk/WebCore/platform/MIMETypeRegistry.cpp webkit/trunk/WebCore/platform/haiku/CookieJarHaiku.cpp webkit/trunk/WebKit/Jamfile webkit/trunk/WebKit/haiku/API/WebDownloadPrivate.cpp webkit/trunk/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp webkit/trunk/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp Modified: webkit/trunk/WebCore/platform/MIMETypeRegistry.cpp ============================================================================== --- webkit/trunk/WebCore/platform/MIMETypeRegistry.cpp Wed May 2 00:43:57 2012 (r588) +++ webkit/trunk/WebCore/platform/MIMETypeRegistry.cpp Fri Jun 8 00:24:10 2012 (r589) @@ -44,7 +44,6 @@ #include <qimagewriter.h> #endif #if PLATFORM(HAIKU) -#include "CString.h" #include <Entry.h> #include <Node.h> #include <NodeInfo.h> Modified: webkit/trunk/WebCore/platform/haiku/CookieJarHaiku.cpp ============================================================================== --- webkit/trunk/WebCore/platform/haiku/CookieJarHaiku.cpp Wed May 2 00:43:57 2012 (r588) +++ webkit/trunk/WebCore/platform/haiku/CookieJarHaiku.cpp Fri Jun 8 00:24:10 2012 (r589) @@ -30,7 +30,6 @@ #include "CookieJar.h" #include "Cookie.h" -#include "CString.h" #include "KURL.h" #include "PlatformString.h" #include "StringHash.h" Modified: webkit/trunk/WebKit/Jamfile ============================================================================== --- webkit/trunk/WebKit/Jamfile Wed May 2 00:43:57 2012 (r588) +++ webkit/trunk/WebKit/Jamfile Fri Jun 8 00:24:10 2012 (r589) @@ -20,6 +20,7 @@ SubDirHdrs $(TOP) JavaScriptCore jit ; SubDirHdrs $(TOP) JavaScriptCore parser ; SubDirHdrs $(TOP) JavaScriptCore runtime ; +SubDirHdrs $(TOP) JavaScriptCore wtf ; SubDirHdrs $(TOP) WebCore DerivedSources WebCore ; SubDirHdrs $(TOP) WebCore ForwardingHeaders wtf ; @@ -103,7 +104,7 @@ : libjavascriptcore.so libwebcore.so libwebkit.so # Other required libraries - curl icuuc icudt png sqlite3 xml2 z + curl icuuc icudata png sqlite3 xml2 z # Haiku libraries be bsd network stdc++ translation : Modified: webkit/trunk/WebKit/haiku/API/WebDownloadPrivate.cpp ============================================================================== --- webkit/trunk/WebKit/haiku/API/WebDownloadPrivate.cpp Wed May 2 00:43:57 2012 (r588) +++ webkit/trunk/WebKit/haiku/API/WebDownloadPrivate.cpp Fri Jun 8 00:24:10 2012 (r589) @@ -28,7 +28,6 @@ #include "config.h" #include "WebDownloadPrivate.h" -#include "CString.h" #include "NotImplemented.h" #include "ResourceHandle.h" #include "ResourceHandleInternal.h" Modified: webkit/trunk/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp ============================================================================== --- webkit/trunk/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp Wed May 2 00:43:57 2012 (r588) +++ webkit/trunk/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp Fri Jun 8 00:24:10 2012 (r589) @@ -33,7 +33,6 @@ #include "config.h" #include "EditorClientHaiku.h" -#include "CString.h" #include "Document.h" #include "EditCommand.h" #include "Editor.h" Modified: webkit/trunk/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp ============================================================================== --- webkit/trunk/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp Wed May 2 00:43:57 2012 (r588) +++ webkit/trunk/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp Fri Jun 8 00:24:10 2012 (r589) @@ -37,7 +37,6 @@ #include "AuthenticationChallenge.h" #include "Credential.h" #include "CachedFrame.h" -#include "CString.h" #include "DocumentLoader.h" #include "FormState.h" #include "Frame.h"