Reviewed by Hyatt.
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 5 Jun 2005 20:57:29 +0000 (20:57 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 5 Jun 2005 20:57:29 +0000 (20:57 +0000)
        - fixed build that I broke with the license change (some includes of WebException were still around)

        * WebKit.pbproj/project.pbxproj: Removed references to WebException.h/m.
        * WebView.subproj/WebDataSource.m: Removed include of WebException.h.
        * WebView.subproj/WebHTMLView.m: Ditto.
        * WebView.subproj/WebView.m: Ditto.

        - fixed build under gcc 4.0 (some code moved here from Foundation had warnings)

        * Misc.subproj/WebNSDataExtras.m:
        (-[NSString _web_capitalizeRFC822HeaderFieldName]): Use char instead of UInt8.
        (-[NSData _webkit_guessedMIMEType]):  Use char instead of UInt8, and take out now-
        unneeded type casts.

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

WebKit/ChangeLog
WebKit/Misc.subproj/WebNSDataExtras.m
WebKit/WebKit.pbproj/project.pbxproj
WebKit/WebView.subproj/WebDataSource.m
WebKit/WebView.subproj/WebHTMLView.m
WebKit/WebView.subproj/WebPreferences.m
WebKit/WebView.subproj/WebView.m

index 0c970d268354494bf8b07ca0e485a2aa54038dd9..cb5725da72a4bee188676c8a625816bc8198992c 100644 (file)
@@ -1,3 +1,21 @@
+2005-06-05  Darin Adler  <darin@apple.com>
+
+        Reviewed by Hyatt.
+
+        - fixed build that I broke with the license change (some includes of WebException were still around)
+
+        * WebKit.pbproj/project.pbxproj: Removed references to WebException.h/m.
+        * WebView.subproj/WebDataSource.m: Removed include of WebException.h.
+        * WebView.subproj/WebHTMLView.m: Ditto.
+        * WebView.subproj/WebView.m: Ditto.
+
+        - fixed build under gcc 4.0 (some code moved here from Foundation had warnings)
+
+        * Misc.subproj/WebNSDataExtras.m:
+        (-[NSString _web_capitalizeRFC822HeaderFieldName]): Use char instead of UInt8.
+        (-[NSData _webkit_guessedMIMEType]):  Use char instead of UInt8, and take out now-
+        unneeded type casts.
+
 2005-06-05  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Don.
index 653aed7831c7c84844266be4bef8eb8f4accd112..a6a14c06d0b5aa7ca5832535f93484663f404cdc 100644 (file)
@@ -43,7 +43,7 @@
 
     CFIndex i; 
     CFIndex len = CFStringGetLength(name);
-    UInt8 *charPtr = NULL;
+    char *charPtr = NULL;
     UniChar *uniCharPtr = NULL;
     Boolean useUniCharPtr = FALSE;
     Boolean shouldCapitalize = TRUE;
@@ -296,9 +296,9 @@ static const UInt8 *_findEOL(const UInt8 *bytes, CFIndex len) {
     }
     
     int length = [self length];
-    const UInt8 *bytes = [self bytes];
+    const char *bytes = [self bytes];
 
-    const char *p = (const char *)bytes;
+    const char *p = bytes;
     int remaining = MIN(length, WEB_GUESS_MIME_TYPE_PEEK_LENGTH) - (SCRIPT_TAG_LENGTH - 1);
     while (remaining > 0) {
         // Look for a "<".
@@ -322,7 +322,7 @@ static const UInt8 *_findEOL(const UInt8 *bytes, CFIndex len) {
 
     // Test for a broken server which has sent the content type as part of the content.
     // This code could be improved to look for other mime types.
-    p = (const char *)bytes;
+    p = bytes;
     remaining = MIN(length, WEB_GUESS_MIME_TYPE_PEEK_LENGTH) - (TEXT_HTML_LENGTH - 1);
     while (remaining > 0) {
         // Look for a "t" or "T".
index 6293c4b82bd919ea961e08f9847168134fb6db56..538cd83dfb6e26657d3e3424b521d875a77c81fc 100644 (file)
 //254
                254DC334016E1D3F0ECA149E = {
                        children = (
-                               3944607A020F50ED0ECA1767,
-                               3944607B020F50ED0ECA1767,
                                F528E3E9031E91AD01CA2ACA,
                                F528E3EA031E91AD01CA2ACA,
                                F528E3EB031E91AD01CA2ACA,
                        refType = 4;
                        sourceTree = "<group>";
                };
-               3944607A020F50ED0ECA1767 = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.h;
-                       path = WebException.h;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               3944607B020F50ED0ECA1767 = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.objc;
-                       path = WebException.m;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                3944607D020F50ED0ECA1767 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;
                                939810140824BF01008DF038,
                                939810150824BF01008DF038,
                                939810160824BF01008DF038,
-                               939810170824BF01008DF038,
                                939810180824BF01008DF038,
                                939810190824BF01008DF038,
                                9398101A0824BF01008DF038,
                                );
                        };
                };
-               939810170824BF01008DF038 = {
-                       fileRef = 3944607A020F50ED0ECA1767;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
                939810180824BF01008DF038 = {
                        fileRef = F528E3E9031E91AD01CA2ACA;
                        isa = PBXBuildFile;
                                939810BD0824BF01008DF038,
                                939810BE0824BF01008DF038,
                                939810BF0824BF01008DF038,
-                               939810C00824BF01008DF038,
                                939810C10824BF01008DF038,
                                939810C20824BF01008DF038,
                                939810C30824BF01008DF038,
                        settings = {
                        };
                };
-               939810C00824BF01008DF038 = {
-                       fileRef = 3944607B020F50ED0ECA1767;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
                939810C10824BF01008DF038 = {
                        fileRef = F528E3EA031E91AD01CA2ACA;
                        isa = PBXBuildFile;
index aac48ba1ab7c1750c10fc6f5f475dc1cbcee6fa4..917cd9f19e8f20e5673e82edd6747d3e3b96b136 100644 (file)
@@ -36,7 +36,6 @@
 #import <WebKit/WebDefaultResourceLoadDelegate.h>
 #import <WebKit/WebDocument.h>
 #import <WebKit/WebDOMOperationsPrivate.h>
-#import <WebKit/WebException.h>
 #import <WebKit/WebFrameLoadDelegate.h>
 #import <WebKit/WebFramePrivate.h>
 #import <WebKit/WebFrameView.h>
index 0092e6d72458ccab60a4524f913f6e2849f97a5c..65adb2b2bf433d0e694a4a5fe576284f3ba59f8c 100644 (file)
@@ -39,7 +39,6 @@
 #import <WebKit/WebDocumentInternal.h>
 #import <WebKit/WebDOMOperationsPrivate.h>
 #import <WebKit/WebEditingDelegate.h>
-#import <WebKit/WebException.h>
 #import <WebKit/WebFramePrivate.h>
 #import <WebKit/WebFrameViewInternal.h>
 #import <WebKit/WebHTMLViewInternal.h>
index b8295c88bb67d0a7a8451322fad9f57aefacc034..5a5fbb00b7577aa0347a13acd71f53591bac521f 100644 (file)
@@ -262,6 +262,8 @@ NS_ENDHANDLER
 
 - (void)_setStringValue:(NSString *)value forKey:(NSString *)key
 {
+    if ([[self _stringValueForKey:key] isEqualToString:value])
+        return;
     NSString *_key = KEY(key);
     [_private->values setObject:value forKey:_key];
     if (_private->autosaves)
@@ -278,6 +280,8 @@ NS_ENDHANDLER
 
 - (void)_setIntegerValue:(int)value forKey:(NSString *)key
 {
+    if ([self _integerValueForKey:key] == value)
+        return;
     NSString *_key = KEY(key);
     [_private->values _webkit_setInt:value forKey:_key];
     if (_private->autosaves)
@@ -292,6 +296,8 @@ NS_ENDHANDLER
 
 - (void)_setBoolValue:(BOOL)value forKey:(NSString *)key
 {
+    if ([self _boolValueForKey:key] == value)
+        return;
     NSString *_key = KEY(key);
     [_private->values _webkit_setBool:value forKey:_key];
     if (_private->autosaves)
index d45f6220cb806ba35a66855e767b7c8ae03941b3..3145c06eb2ab80a5311d9f8c2e079bc3cdb16de5 100644 (file)
@@ -49,7 +49,6 @@
 #import <WebKit/WebDynamicScrollBarsView.h>
 #import <WebKit/WebDownload.h>
 #import <WebKit/WebEditingDelegate.h>
-#import <WebKit/WebException.h>
 #import <WebKit/WebFormDelegatePrivate.h>
 #import <WebKit/WebFrameInternal.h>
 #import <WebKit/WebFrameViewInternal.h>