[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:42:19 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5299d242fdd4935f4acb43386afc339ff516ab34
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu May 15 18:19:03 2003 +0000
Tests:
Reviewed by John
Changed the names of some extras files in WebFoundation:
Updated imports and usages in the tests.
WebNSArrayExtras -> NSArray_NSURLExtras
WebNSCalendarDateExtras -> NSCalendarDate_NSURLExtras
WebNSObjectExtras -> NSObject_NSURLExtras
WebNSStringExtras -> NSString_NSURLExtras
WebNSURLExtras -> NSURL_NSURLExtras
* WebFoundation-Misc/ifnsarrayextensions-test.m:
* WebFoundation-Misc/ifnscalendardateextensions-test.m:
* WebFoundation-Misc/ifnsobjectextensions-test.m:
* WebFoundation-Misc/ifnsstringextensions-test.m:
* WebFoundation-Misc/ifnsurlextensions-test.m:
* WebFoundation-Misc/ifurlparsing-test.m:
WebFoundation:
Reviewed by John
Changed the names of some extras files:
Updated imports and usages in this project.
WebNSArrayExtras -> NSArray_NSURLExtras
WebNSCalendarDateExtras -> NSCalendarDate_NSURLExtras
WebNSDataExtras -> NSData_NSURLExtras
WebNSDictionaryExtras -> NSDictionary_NSURLExtras
WebNSErrorExtras -> NSError_NSURLExtras
WebNSFileManagerExtras -> NSFileManager_NSURLExtras
WebNSObjectExtras -> NSObject_NSURLExtras
WebNSStringExtras -> NSString_NSURLExtras
WebNSURLExtras -> NSURL_NSURLExtras
WebNSUserDefaultsExtras -> NSUserDefaults_NSURLExtras
WebNSValueExtensions -> NSValue_NSURLExtras
* AuthenticationManager.subproj/NSHTTPAuthenticator.m:
* AuthenticationManager.subproj/NSURLCredentialStorage.m:
* AuthenticationManager.subproj/NSURLKeychainCredential.m:
* AuthenticationManager.subproj/NSURLKeychainCredentialStorage.m:
* CacheLoader.subproj/NSNetworkSettings.m:
* CacheLoader.subproj/NSSynchronousURLConnectionDelegate.m:
* CacheLoader.subproj/NSURLCache.m:
* CacheLoader.subproj/NSURLConnection.m:
* CacheLoader.subproj/NSURLConnectionQueue.m:
* CacheLoader.subproj/NSURLProtocol.m:
* CacheLoader.subproj/NSURLRequest.m:
* CacheLoader.subproj/NSURLResponse.m:
* ChangeLog:
* CookieManager.subproj/NSHTTPCookie.m:
* CookieManager.subproj/NSHTTPCookieDOStorage.m:
* CookieManager.subproj/NSHTTPCookieServer.m:
* CookieManager.subproj/NSHTTPCookieStorage.m:
* Database.subproj/WebFileDatabase.m:
* English.lproj/StringsNotToBeLocalized.txt:
* FileTransfer.subproj/NSBinHexDecoder.m:
* FileTransfer.subproj/NSMacBinaryDecoder.m:
* FileTransfer.subproj/NSURLDownload.m:
* Misc.subproj/NSArray_NSURLExtras.m:
* Misc.subproj/NSCalendarDate_NSURLExtras.h:
* Misc.subproj/NSCalendarDate_NSURLExtras.m:
* Misc.subproj/NSData_NSURLExtras.h:
* Misc.subproj/NSData_NSURLExtras.m:
* Misc.subproj/NSDictionary_NSURLExtras.h:
* Misc.subproj/NSDictionary_NSURLExtras.m:
* Misc.subproj/NSError_NSURLExtras.h:
* Misc.subproj/NSError_NSURLExtras.m:
* Misc.subproj/NSFileManager_NSURLExtras.h:
* Misc.subproj/NSFileManager_NSURLExtras.m:
* Misc.subproj/NSObject_NSURLExtras.h:
* Misc.subproj/NSObject_NSURLExtras.m:
* Misc.subproj/NSString_NSURLExtras.h:
* Misc.subproj/NSString_NSURLExtras.m:
* Misc.subproj/NSURL_NSURLExtras.h:
* Misc.subproj/NSURL_NSURLExtras.m:
* Misc.subproj/NSUserDefaults_NSURLExtras.h:
* Misc.subproj/NSUserDefaults_NSURLExtras.m:
* Misc.subproj/NSValue_NSURLExtras.h:
* Misc.subproj/NSValue_NSURLExtras.m:
* Misc.subproj/WebNSArrayExtras.h: Removed.
* Misc.subproj/WebNSArrayExtras.m: Removed.
* Misc.subproj/WebNSCalendarDateExtras.h: Removed.
* Misc.subproj/WebNSCalendarDateExtras.m: Removed.
* Misc.subproj/WebNSDataExtras.h: Removed.
* Misc.subproj/WebNSDataExtras.m: Removed.
* Misc.subproj/WebNSDictionaryExtras.h: Removed.
* Misc.subproj/WebNSDictionaryExtras.m: Removed.
* Misc.subproj/WebNSErrorExtras.h: Removed.
* Misc.subproj/WebNSErrorExtras.m: Removed.
* Misc.subproj/WebNSFileManagerExtras.h: Removed.
* Misc.subproj/WebNSFileManagerExtras.m: Removed.
* Misc.subproj/WebNSObjectExtras.h: Removed.
* Misc.subproj/WebNSObjectExtras.m: Removed.
* Misc.subproj/WebNSStringExtras.h: Removed.
* Misc.subproj/WebNSStringExtras.m: Removed.
* Misc.subproj/WebNSURLExtras.h: Removed.
* Misc.subproj/WebNSURLExtras.m: Removed.
* Misc.subproj/WebNSUserDefaultsExtras.h: Removed.
* Misc.subproj/WebNSUserDefaultsExtras.m: Removed.
* Misc.subproj/WebNSValueExtensions.h: Removed.
* Misc.subproj/WebNSValueExtensions.m: Removed.
* ProtocolHandlers.subproj/NSAboutURLProtocol.m:
* ProtocolHandlers.subproj/NSCFNetworkHTTPURLProtocol.m:
* ProtocolHandlers.subproj/NSFTPURLProtocol.m:
* ProtocolHandlers.subproj/NSFileURLProtocol.m:
* ProtocolHandlers.subproj/NSHTTPURLProtocol.m:
* ProtocolHandlers.subproj/NSSimpleHTTPURLProtocol.m:
* WebFoundation-base.exp:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Reviewed by John
Changed the names of some extras files in WebFoundation:
Updated imports and usages in this project.
WebNSCalendarDateExtras -> NSCalendarDate_NSURLExtras
WebNSDataExtras -> NSData_NSURLExtras
WebNSDictionaryExtras -> NSDictionary_NSURLExtras
WebNSErrorExtras -> NSError_NSURLExtras
WebNSFileManagerExtras -> NSFileManager_NSURLExtras
WebNSObjectExtras -> NSObject_NSURLExtras
WebNSStringExtras -> NSString_NSURLExtras
WebNSURLExtras -> NSURL_NSURLExtras
WebNSUserDefaultsExtras -> NSUserDefaults_NSURLExtras
* History.subproj/WebHistory.m:
* History.subproj/WebHistoryItem.m:
* History.subproj/WebHistoryPrivate.m:
* History.subproj/WebURLsWithTitles.m:
* Misc.subproj/WebIconDatabase.m:
* Misc.subproj/WebIconLoader.m:
* Misc.subproj/WebKitErrors.m:
* Misc.subproj/WebNSPasteboardExtras.m:
* Misc.subproj/WebNSViewExtras.m:
* Panels.subproj/WebAuthenticationPanel.m:
* Panels.subproj/WebPanelAuthenticationHandler.m:
* Plugins.subproj/WebBaseNetscapePluginStream.m:
* Plugins.subproj/WebBaseNetscapePluginView.m:
* Plugins.subproj/WebNetscapePluginRepresentation.m:
* Plugins.subproj/WebNullPluginView.m:
* WebCoreSupport.subproj/WebBridge.m:
* WebCoreSupport.subproj/WebCookieAdapter.m:
* WebCoreSupport.subproj/WebSubresourceClient.m:
* WebView.subproj/WebBaseResourceHandleDelegate.m:
* WebView.subproj/WebDataProtocol.m:
* WebView.subproj/WebDataSource.m:
* WebView.subproj/WebDataSourcePrivate.m:
* WebView.subproj/WebDefaultResourceLoadDelegate.m:
* WebView.subproj/WebFrame.m:
* WebView.subproj/WebFramePrivate.m:
* WebView.subproj/WebFrameView.m:
* WebView.subproj/WebFrameViewPrivate.m:
* WebView.subproj/WebHTMLViewPrivate.m:
* WebView.subproj/WebMainResourceClient.m:
* WebView.subproj/WebPreferences.m:
* WebView.subproj/WebView.m:
* WebView.subproj/WebViewPrivate.m:
WebBrowser:
Reviewed by John
Changed the names of some extras files in WebFoundation:
Updated imports and usages in this project.
WebNSCalendarDateExtras -> NSCalendarDate_NSURLExtras
WebNSDictionaryExtras -> NSDictionary_NSURLExtras
WebNSErrorExtras -> NSError_NSURLExtras
WebNSFileManagerExtras -> NSFileManager_NSURLExtras
WebNSStringExtras -> NSString_NSURLExtras
WebNSURLExtras -> NSURL_NSURLExtras
WebNSUserDefaultsExtras -> NSUserDefaults_NSURLExtras
* AppController.m:
(-[AppController settingsDirectoryPath]):
* BookmarkSource.m:
* BookmarksViewController.m:
* BrowserDocument.m:
* BrowserDocumentController.m:
* BrowserNSBundleExtras.m:
* BrowserNSErrorExtras.m:
* BrowserNSNetServiceExtras.m:
* BrowserNSStringExtras.m:
* BrowserNSURLExtras.m:
* BrowserWebBookmarkExtras.m:
* BrowserWebController.m:
* BrowserWindowController.m:
* BugReportController.m:
* ChangeLog:
* ContextMenuHandler.m:
* Debug/DebugUtilities.m:
* DownloadMonitor.m:
* DownloadProgressEntry.m:
* DownloadRow.m:
* FormCompletionController.m:
* FrameProgressEntry.m:
* GlobalHistory.m:
* GoogleSearchChannel.m:
* LoadProgressMonitor.m:
* LocationChangeError.m:
* LocationChangeHandler.m:
* LocationFieldEditor.m:
* NewBookmarksController.m:
* Preferences.subproj/AdvancedPreferences.m:
* Preferences.subproj/DefaultBrowserController.m:
* Preferences.subproj/WBPreferences.m:
* RendezvousController.m:
* ResourceProgressEntry.m:
* SlidingAnimation.m:
* SpinningProgressIndicator.m:
* TabBarView.m:
* Test/PageLoadTestController.m:
* Test/PageLoadTestRunner.m:
* TitleBarButton.m:
* URLCompletionController.m:
(visitCountForResult):
* WebBookmarkImporter.m:
* WebBookmarkLeaf.m:
* main.m:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4378 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a1ecd4a..f0c0ff5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,53 @@
+2003-05-15 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by John
+
+ Changed the names of some extras files in WebFoundation:
+ Updated imports and usages in this project.
+
+ WebNSCalendarDateExtras -> NSCalendarDate_NSURLExtras
+ WebNSDataExtras -> NSData_NSURLExtras
+ WebNSDictionaryExtras -> NSDictionary_NSURLExtras
+ WebNSErrorExtras -> NSError_NSURLExtras
+ WebNSFileManagerExtras -> NSFileManager_NSURLExtras
+ WebNSObjectExtras -> NSObject_NSURLExtras
+ WebNSStringExtras -> NSString_NSURLExtras
+ WebNSURLExtras -> NSURL_NSURLExtras
+ WebNSUserDefaultsExtras -> NSUserDefaults_NSURLExtras
+
+ * History.subproj/WebHistory.m:
+ * History.subproj/WebHistoryItem.m:
+ * History.subproj/WebHistoryPrivate.m:
+ * History.subproj/WebURLsWithTitles.m:
+ * Misc.subproj/WebIconDatabase.m:
+ * Misc.subproj/WebIconLoader.m:
+ * Misc.subproj/WebKitErrors.m:
+ * Misc.subproj/WebNSPasteboardExtras.m:
+ * Misc.subproj/WebNSViewExtras.m:
+ * Panels.subproj/WebAuthenticationPanel.m:
+ * Panels.subproj/WebPanelAuthenticationHandler.m:
+ * Plugins.subproj/WebBaseNetscapePluginStream.m:
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ * Plugins.subproj/WebNetscapePluginRepresentation.m:
+ * Plugins.subproj/WebNullPluginView.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ * WebCoreSupport.subproj/WebCookieAdapter.m:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ * WebView.subproj/WebDataProtocol.m:
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ * WebView.subproj/WebDefaultResourceLoadDelegate.m:
+ * WebView.subproj/WebFrame.m:
+ * WebView.subproj/WebFramePrivate.m:
+ * WebView.subproj/WebFrameView.m:
+ * WebView.subproj/WebFrameViewPrivate.m:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ * WebView.subproj/WebPreferences.m:
+ * WebView.subproj/WebView.m:
+ * WebView.subproj/WebViewPrivate.m:
+
2003-05-14 Ken Kocienda <kocienda at apple.com>
Reviewed by Chris
diff --git a/WebKit/History.subproj/WebHistory.m b/WebKit/History.subproj/WebHistory.m
index 185cc09..f154c6b 100644
--- a/WebKit/History.subproj/WebHistory.m
+++ b/WebKit/History.subproj/WebHistory.m
@@ -12,8 +12,8 @@
#import <WebFoundation/NSError.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#import <WebCore/WebCoreHistory.h>
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 4b6e297..865cfb8 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -11,8 +11,8 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebNSDictionaryExtras.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSDictionary_NSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#import <CoreGraphics/CoreGraphicsPrivate.h>
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index cb2e4f3..7a4f6cc 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -16,8 +16,8 @@
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/WebNSCalendarDateExtras.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSCalendarDate_NSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
NSString *FileVersionKey = @"WebHistoryFileVersion";
NSString *DatesArrayKey = @"WebHistoryDates";
diff --git a/WebKit/History.subproj/WebURLsWithTitles.m b/WebKit/History.subproj/WebURLsWithTitles.m
index 9c28732..2d397b7 100644
--- a/WebKit/History.subproj/WebURLsWithTitles.m
+++ b/WebKit/History.subproj/WebURLsWithTitles.m
@@ -8,7 +8,7 @@
#import "WebURLsWithTitles.h"
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
@implementation WebURLsWithTitles
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index be93b81..3e0e239 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -15,7 +15,7 @@
#import "NSURLLogging.h"
#import "NSLRUFileList.h"
-#import "WebNSFileManagerExtras.h"
+#import "NSFileManager_NSURLExtras.h"
#import "WebSystemBits.h"
#if NSURL_ERROR_DISABLED
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index cc3be6d..4713734 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -11,8 +11,8 @@
#import <WebKit/WebIconDatabasePrivate.h>
#import <WebKit/WebKitLogging.h>
-#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSString_NSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#import <WebFoundation/WebFileDatabase.h>
NSString * const WebIconDatabaseVersionKey = @"WebIconDatabaseVersion";
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index fb07a2b..4fbe8b6 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -11,7 +11,7 @@
#import <WebKit/WebIconDatabase.h>
#import <WebKit/WebIconDatabasePrivate.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
diff --git a/WebKit/Misc.subproj/WebKitErrors.m b/WebKit/Misc.subproj/WebKitErrors.m
index c4f676d..ee801d9 100644
--- a/WebKit/Misc.subproj/WebKitErrors.m
+++ b/WebKit/Misc.subproj/WebKitErrors.m
@@ -10,7 +10,7 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebLocalizableStrings.h>
-#import <WebFoundation/WebNSErrorExtras.h>
+#import <WebFoundation/NSError_NSURLExtras.h>
#import <pthread.h>
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index 36e171d..2df55a3 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -11,8 +11,8 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSString_NSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#import <ApplicationServices/ApplicationServicesPriv.h>
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.m b/WebKit/Misc.subproj/WebNSViewExtras.m
index 419ec51..59d934d 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.m
+++ b/WebKit/Misc.subproj/WebNSViewExtras.m
@@ -8,8 +8,8 @@
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebNSViewExtras.h>
-#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSString_NSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#define WebDragStartHysteresisX 5.0
#define WebDragStartHysteresisY 5.0
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index 197aeeb..c8d680e 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -11,7 +11,7 @@
#import <WebFoundation/NSURLProtectionSpace.h>
#import <WebKit/WebAssertions.h>
#import <WebKit/WebLocalizableStrings.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#import <WebKit/WebNSControlExtras.h>
diff --git a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
index 75d68d2..5fe9e30 100644
--- a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
+++ b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
@@ -9,7 +9,7 @@
#import <WebKit/WebAuthenticationPanel.h>
#import <WebFoundation/NSURLAuthenticationChallenge.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebNSDictionaryExtras.h>
+#import <WebFoundation/NSDictionary_NSURLExtras.h>
static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
index e28bc7a..1a6a18a 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
@@ -10,7 +10,7 @@
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/NSURLResponsePrivate.h>
-#import <WebFoundation/WebNSFileManagerExtras.h>
+#import <WebFoundation/NSFileManager_NSURLExtras.h>
@implementation WebBaseNetscapePluginStream
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 6569524..7939e7f 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -23,9 +23,9 @@
#import <WebKit/WebAssertions.h>
#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/WebNSDataExtras.h>
-#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSData_NSURLExtras.h>
+#import <WebFoundation/NSString_NSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#import <AppKit/NSEvent_Private.h>
#import <Carbon/Carbon.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
index 2897122..35b01f4 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
@@ -11,7 +11,7 @@
#import <WebFoundation/NSURLResponse.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebNSErrorExtras.h>
+#import <WebFoundation/NSError_NSURLExtras.h>
#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
#import <WebFoundation/NSError.h>
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 211e599..5e64672 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -12,7 +12,7 @@
#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/NSError.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
static NSImage *image = nil;
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index b14cae2..ae2fc76 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -42,9 +42,9 @@
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebNSDictionaryExtras.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSString_NSURLExtras.h>
+#import <WebFoundation/NSDictionary_NSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/NSURLFileTypeMappings.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
index 3b7790b..f9eb126 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
@@ -10,7 +10,7 @@
#import <WebKit/WebAssertions.h>
#import <WebFoundation/NSHTTPCookieStorage.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
@implementation WebCookieAdapter
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 4ca1de0..d023f3f 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -15,7 +15,7 @@
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebNSErrorExtras.h>
+#import <WebFoundation/NSError_NSURLExtras.h>
#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
#import <WebFoundation/NSError.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 4ca1de0..d023f3f 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -15,7 +15,7 @@
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebNSErrorExtras.h>
+#import <WebFoundation/NSError_NSURLExtras.h>
#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
#import <WebFoundation/NSError.h>
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 2571489..b66f539 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -13,7 +13,7 @@
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/NSURLResponsePrivate.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebNSErrorExtras.h>
+#import <WebFoundation/NSError_NSURLExtras.h>
#import <WebKit/WebDataProtocol.h>
#import <WebKit/WebDataSourcePrivate.h>
diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index 3c666d7..8649b38 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -6,8 +6,8 @@
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/NSURLResponsePrivate.h>
-#import <WebFoundation/WebNSErrorExtras.h>
-#import <WebFoundation/WebNSStringExtras.h>
+#import <WebFoundation/NSError_NSURLExtras.h>
+#import <WebFoundation/NSString_NSURLExtras.h>
#import <WebKit/WebAssertions.h>
NSString *WebDataProtocolScheme = @"applewebdata";
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index d4181bd..d5c7975 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -19,7 +19,7 @@
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/WebNSDictionaryExtras.h>
+#import <WebFoundation/NSDictionary_NSURLExtras.h>
@implementation WebDataSource
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index f15584f..202721e 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -29,10 +29,10 @@
#import <WebKit/WebTextRepresentation.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/WebNSDictionaryExtras.h>
-#import <WebFoundation/WebNSErrorExtras.h>
-#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSDictionary_NSURLExtras.h>
+#import <WebFoundation/NSError_NSURLExtras.h>
+#import <WebFoundation/NSString_NSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLResponse.h>
diff --git a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
index 62327df..421ce6f 100644
--- a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
@@ -9,7 +9,7 @@
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/WebNSErrorExtras.h>
+#import <WebFoundation/NSError_NSURLExtras.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebPanelAuthenticationHandler.h>
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 850cd98..bb49d71 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -22,9 +22,9 @@
#import <WebKit/WebUIDelegate.h>
#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
-#import <WebFoundation/WebNSStringExtras.h>
+#import <WebFoundation/NSString_NSURLExtras.h>
@implementation WebFrame
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 421260f..efe63d3 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -30,9 +30,9 @@
#import <WebKit/WebUIDelegate.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/WebNSErrorExtras.h>
-#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebNSStringExtras.h>
+#import <WebFoundation/NSError_NSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <WebFoundation/NSString_NSURLExtras.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 966162c..83391ca 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -24,8 +24,8 @@
#import <WebKit/WebViewFactory.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/WebNSDictionaryExtras.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSDictionary_NSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#import <WebFoundation/NSURLRequest.h>
enum {
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 2eebcf0..ba5b42c 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -12,7 +12,7 @@
#import <WebKit/WebTextView.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/WebNSDictionaryExtras.h>
+#import <WebFoundation/NSDictionary_NSURLExtras.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebKit/WebAssertions.h>
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 5acb3b3..424e1ea 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -9,7 +9,7 @@
#import <AppKit/NSResponder_Private.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#import <WebCore/WebCoreFirstResponderChanges.h>
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 2571489..b66f539 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -13,7 +13,7 @@
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/NSURLResponsePrivate.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebNSErrorExtras.h>
+#import <WebFoundation/NSError_NSURLExtras.h>
#import <WebKit/WebDataProtocol.h>
#import <WebKit/WebDataSourcePrivate.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index ddeb5bc..339579e 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -6,10 +6,10 @@
#import <WebKit/WebMainResourceClient.h>
#import <WebFoundation/NSHTTPCookie.h>
-#import <WebFoundation/WebNSErrorExtras.h>
+#import <WebFoundation/NSError_NSURLExtras.h>
#import <WebFoundation/NSURLFileTypeMappings.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLConnectionPrivate.h>
#import <WebFoundation/NSURLDownloadPrivate.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index ddeb5bc..339579e 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -6,10 +6,10 @@
#import <WebKit/WebMainResourceClient.h>
#import <WebFoundation/NSHTTPCookie.h>
-#import <WebFoundation/WebNSErrorExtras.h>
+#import <WebFoundation/NSError_NSURLExtras.h>
#import <WebFoundation/NSURLFileTypeMappings.h>
-#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/NSURL_NSURLExtras.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLConnectionPrivate.h>
#import <WebFoundation/NSURLDownloadPrivate.h>
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index f941f7e..bccec76 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -5,7 +5,7 @@
#import "WebPreferences.h"
-#import <WebFoundation/WebNSDictionaryExtras.h>
+#import <WebFoundation/NSDictionary_NSURLExtras.h>
#import <WebCore/WebCoreSettings.h>
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 36d8b97..606387d 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -30,7 +30,7 @@
#import <WebKit/WebUIDelegate.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebNSUserDefaultsExtras.h>
+#import <WebFoundation/NSUserDefaults_NSURLExtras.h>
#import <WebFoundation/NSURLConnection.h>
static const struct UserAgentSpoofTableEntry *_web_findSpoofTableEntry(const char *, unsigned);
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index c3b93ac..1e293f2 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -26,8 +26,8 @@
#import <WebKit/WebAssertions.h>
#import <WebFoundation/NSURLFileTypeMappings.h>
-#import <WebFoundation/WebNSDataExtras.h>
-#import <WebFoundation/WebNSStringExtras.h>
+#import <WebFoundation/NSData_NSURLExtras.h>
+#import <WebFoundation/NSString_NSURLExtras.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLDownloadPrivate.h>
#import <WebFoundation/NSURLRequest.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list