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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit f09ea93af78bf8568bf531edac82d68bfe0b42b6
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 8 00:59:14 2001 +0000

    Renamed defaults keys to something more friendly such as WebKitStandardFont
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index f7ccccb..433f449 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -37,7 +37,7 @@ KHTMLSettings::KHTMLSettings()
     m_fontFamilies = NSSTRING_TO_QSTRING([array componentsJoinedByString:@","]);
     
     m_fontSizes.clear();
-    fontSizeArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"fontSizes"];
+    fontSizeArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"WebKitFontSizes"];
     for(i=0; i<[fontSizeArray count]; i++){
         m_fontSizes << [[fontSizeArray objectAtIndex:i] intValue];
     }
@@ -45,37 +45,37 @@ KHTMLSettings::KHTMLSettings()
 
 QString KHTMLSettings::stdFontName() const
 {
-    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"stdFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitStandardFont"]);
 }
 
 
 QString KHTMLSettings::fixedFontName() const
 {
-    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"fixedFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitFixedFont"]);
 }
 
 
 QString KHTMLSettings::serifFontName() const
 {
-    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"serifFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitSerifFont"]);
 }
 
 
 QString KHTMLSettings::sansSerifFontName() const
 {
-    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"sansSerifFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitSansSerifFont"]);
 }
 
 
 QString KHTMLSettings::cursiveFontName() const
 {
-    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"cursiveFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitCursiveFont"]);
 }
 
 
 QString KHTMLSettings::fantasyFontName() const
 {
-    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"fantasyFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitFantasyFont"]);
 }
 
 
@@ -105,7 +105,7 @@ const QString &KHTMLSettings::encoding() const
 
 int KHTMLSettings::minFontSize() const
 {
-    return [[NSUserDefaults standardUserDefaults] integerForKey:@"minFontSize"];
+    return [[NSUserDefaults standardUserDefaults] integerForKey:@"WebKitMinimumFontSize"];
 }
 
 
diff --git a/WebCore/src/kwq/KWQKHTMLSettings.mm b/WebCore/src/kwq/KWQKHTMLSettings.mm
index f7ccccb..433f449 100644
--- a/WebCore/src/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/src/kwq/KWQKHTMLSettings.mm
@@ -37,7 +37,7 @@ KHTMLSettings::KHTMLSettings()
     m_fontFamilies = NSSTRING_TO_QSTRING([array componentsJoinedByString:@","]);
     
     m_fontSizes.clear();
-    fontSizeArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"fontSizes"];
+    fontSizeArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"WebKitFontSizes"];
     for(i=0; i<[fontSizeArray count]; i++){
         m_fontSizes << [[fontSizeArray objectAtIndex:i] intValue];
     }
@@ -45,37 +45,37 @@ KHTMLSettings::KHTMLSettings()
 
 QString KHTMLSettings::stdFontName() const
 {
-    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"stdFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitStandardFont"]);
 }
 
 
 QString KHTMLSettings::fixedFontName() const
 {
-    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"fixedFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitFixedFont"]);
 }
 
 
 QString KHTMLSettings::serifFontName() const
 {
-    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"serifFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitSerifFont"]);
 }
 
 
 QString KHTMLSettings::sansSerifFontName() const
 {
-    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"sansSerifFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitSansSerifFont"]);
 }
 
 
 QString KHTMLSettings::cursiveFontName() const
 {
-    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"cursiveFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitCursiveFont"]);
 }
 
 
 QString KHTMLSettings::fantasyFontName() const
 {
-    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"fantasyFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitFantasyFont"]);
 }
 
 
@@ -105,7 +105,7 @@ const QString &KHTMLSettings::encoding() const
 
 int KHTMLSettings::minFontSize() const
 {
-    return [[NSUserDefaults standardUserDefaults] integerForKey:@"minFontSize"];
+    return [[NSUserDefaults standardUserDefaults] integerForKey:@"WebKitMinimumFontSize"];
 }
 
 
diff --git a/WebKit/WebView.subproj/NSWebPageDataSource.mm b/WebKit/WebView.subproj/NSWebPageDataSource.mm
index 348066c..ee5528a 100644
--- a/WebKit/WebView.subproj/NSWebPageDataSource.mm
+++ b/WebKit/WebView.subproj/NSWebPageDataSource.mm
@@ -12,18 +12,17 @@
     NSArray *fontSizeArray = [NSArray arrayWithObjects:@"6", @"8", @"10", @"12", @"14", @"16", @"18", @"20", nil];
     
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
-        @"Arial", 		@"stdFontName",
-        @"Courier",  		@"fixedFontName",
-        @"Times-Roman", 	@"serifFontName",
-        @"Arial", 		@"sansSerifFontName", 
-        @"Times-Roman", 	@"cursiveFontName",
-        @"Times-Roman", 	@"fantasyFontName",
-        @"6", 			@"minFontSize",
-        fontSizeArray,		@"fontSizes",
+        @"Arial", 		@"WebKitStandardFont",
+        @"Courier",  		@"WebKitFixedFont",
+        @"Times-Roman", 	@"WebKitSerifFont",
+        @"Arial", 		@"WebKitSansSerifFont", 
+        @"Times-Roman", 	@"WebKitCursiveFont",
+        @"Times-Roman", 	@"WebKitFantasyFont",
+        @"6", 			@"WebKitMinimumFontSize",
+        fontSizeArray,		@"WebKitFontSizes",
         nil];
 
     [defaults registerDefaults:dict];
-
 }
 
 @end

-- 
WebKit Debian packaging