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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 4881e40bb52394f1dff821f39a7898f099f0ca64
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 14 17:42:09 2001 +0000

    Fixed a boo-boo that resulted from Richard's checkin last night:
    I added a declaration for _initializeWithFont
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@451 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQFontMetrics.h b/WebCore/kwq/KWQFontMetrics.h
index 925daa8..f9b74b9 100644
--- a/WebCore/kwq/KWQFontMetrics.h
+++ b/WebCore/kwq/KWQFontMetrics.h
@@ -83,7 +83,8 @@ public:
 #ifdef _KWQ_
     void _initialize();
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-    void _initializeWithData(QFontMetricsPrivate *);
+    //void _initializeWithData(QFontMetricsPrivate *);
+    void _initializeWithFont (NSFont *font);
     NSRect _rectOfString(NSString *) const;
 #else
     void _initializeWithData(void *);
diff --git a/WebCore/kwq/qt/qfontmetrics.h b/WebCore/kwq/qt/qfontmetrics.h
index 925daa8..f9b74b9 100644
--- a/WebCore/kwq/qt/qfontmetrics.h
+++ b/WebCore/kwq/qt/qfontmetrics.h
@@ -83,7 +83,8 @@ public:
 #ifdef _KWQ_
     void _initialize();
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-    void _initializeWithData(QFontMetricsPrivate *);
+    //void _initializeWithData(QFontMetricsPrivate *);
+    void _initializeWithFont (NSFont *font);
     NSRect _rectOfString(NSString *) const;
 #else
     void _initializeWithData(void *);
diff --git a/WebCore/src/kwq/qt/qfontmetrics.h b/WebCore/src/kwq/qt/qfontmetrics.h
index 925daa8..f9b74b9 100644
--- a/WebCore/src/kwq/qt/qfontmetrics.h
+++ b/WebCore/src/kwq/qt/qfontmetrics.h
@@ -83,7 +83,8 @@ public:
 #ifdef _KWQ_
     void _initialize();
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-    void _initializeWithData(QFontMetricsPrivate *);
+    //void _initializeWithData(QFontMetricsPrivate *);
+    void _initializeWithFont (NSFont *font);
     NSRect _rectOfString(NSString *) const;
 #else
     void _initializeWithData(void *);

-- 
WebKit Debian packaging