[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit a591e5ef42565a31f3e86ec55562ce5a6bfa8d77
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 22 19:00:04 2002 +0000

            Changed NSString category methods to include _web_ prefix.
    
            * Misc.subproj/WebKitNSStringExtras.h:
            * Misc.subproj/WebKitNSStringExtras.m:
            (-[NSString _web_widthForString:font:]):
    
            Changed NSString category methods to include _web_ prefix.
    
            * EtchedStringView.m:
            (-[EtchedStringView drawRect:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2827 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 34d1726..916e2bf 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2002-11-22  Richard Williamson   <rjw at apple.com>
 
+        Changed NSString category methods to include _web_ prefix.
+
+        * Misc.subproj/WebKitNSStringExtras.h:
+        * Misc.subproj/WebKitNSStringExtras.m:
+        (-[NSString _web_widthForString:font:]):
+
+2002-11-22  Richard Williamson   <rjw at apple.com>
+
         Simplified drawing and measuring SPI for use by Alex.
 
         * Misc.subproj/WebKitNSStringExtras.h: Added.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 34d1726..916e2bf 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-11-22  Richard Williamson   <rjw at apple.com>
 
+        Changed NSString category methods to include _web_ prefix.
+
+        * Misc.subproj/WebKitNSStringExtras.h:
+        * Misc.subproj/WebKitNSStringExtras.m:
+        (-[NSString _web_widthForString:font:]):
+
+2002-11-22  Richard Williamson   <rjw at apple.com>
+
         Simplified drawing and measuring SPI for use by Alex.
 
         * Misc.subproj/WebKitNSStringExtras.h: Added.
diff --git a/WebKit/Misc.subproj/WebKitNSStringExtras.h b/WebKit/Misc.subproj/WebKitNSStringExtras.h
index 1588b4a..9172d0b 100644
--- a/WebKit/Misc.subproj/WebKitNSStringExtras.h
+++ b/WebKit/Misc.subproj/WebKitNSStringExtras.h
@@ -9,8 +9,8 @@
 
 @interface NSString (WebKitExtras)
 
-- (void)drawString:(NSString *)string atPoint:(NSPoint)point font: (NSFont *)font textColor:(NSColor *)textColor;
+- (void)_web_drawString:(NSString *)string atPoint:(NSPoint)point font: (NSFont *)font textColor:(NSColor *)textColor;
 
-- (float)widthForString:(NSString *)string font: (NSFont *)font;
+- (float)_web_widthForString:(NSString *)string font: (NSFont *)font;
 
 @end
diff --git a/WebKit/Misc.subproj/WebKitNSStringExtras.m b/WebKit/Misc.subproj/WebKitNSStringExtras.m
index 2526e79..551ed19 100644
--- a/WebKit/Misc.subproj/WebKitNSStringExtras.m
+++ b/WebKit/Misc.subproj/WebKitNSStringExtras.m
@@ -10,7 +10,7 @@
 
 @implementation NSString (WebKitExtras)
 
-- (void)drawString:(NSString *)string atPoint:(NSPoint)point font: (NSFont *)font textColor:(NSColor *)textColor;
+- (void)_web_drawString:(NSString *)string atPoint:(NSPoint)point font: (NSFont *)font textColor:(NSColor *)textColor;
 {
     if (string == nil) {
         return;
@@ -35,7 +35,7 @@
     free(buffer);
 }
 
-- (float)widthForString:(NSString *)string font: (NSFont *)font
+- (float)_web_widthForString:(NSString *)string font: (NSFont *)font
 {
     if (string == nil)
         return 0;

-- 
WebKit Debian packaging