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

[gramps]

The following commit has been merged in the debian/unstable branch:
commit a986c4aaa5b2dc79db7a09a3b150dad0995ab269
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 17 20:16:13 2001 +0000

    Make the constructor use a CFStringEncoding type
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@346 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQTextCodec.h b/WebCore/kwq/KWQTextCodec.h
index e2b0246..af6817c 100644
--- a/WebCore/kwq/KWQTextCodec.h
+++ b/WebCore/kwq/KWQTextCodec.h
@@ -73,7 +73,7 @@ public:
 
     // constructors, copy constructors, and destructors ------------------------
 
-    QTextCodec(int);
+    QTextCodec(CFStringEncoding);
     ~QTextCodec();
 
     // member functions --------------------------------------------------------
diff --git a/WebCore/kwq/KWQTextCodec.mm b/WebCore/kwq/KWQTextCodec.mm
index e8d3cfc..8b074b1 100644
--- a/WebCore/kwq/KWQTextCodec.mm
+++ b/WebCore/kwq/KWQTextCodec.mm
@@ -80,7 +80,7 @@ QTextCodec *QTextCodec::codecForLocale()
 
 // constructors, copy constructors, and destructors ----------------------------
 
-QTextCodec::QTextCodec(int e)
+QTextCodec::QTextCodec(CFStringEncoding e)
 {
     encoding = e;
 }
diff --git a/WebCore/kwq/qt/qtextcodec.h b/WebCore/kwq/qt/qtextcodec.h
index e2b0246..af6817c 100644
--- a/WebCore/kwq/qt/qtextcodec.h
+++ b/WebCore/kwq/qt/qtextcodec.h
@@ -73,7 +73,7 @@ public:
 
     // constructors, copy constructors, and destructors ------------------------
 
-    QTextCodec(int);
+    QTextCodec(CFStringEncoding);
     ~QTextCodec();
 
     // member functions --------------------------------------------------------
diff --git a/WebCore/src/kwq/KWQtextcodec.mm b/WebCore/src/kwq/KWQtextcodec.mm
index e8d3cfc..8b074b1 100644
--- a/WebCore/src/kwq/KWQtextcodec.mm
+++ b/WebCore/src/kwq/KWQtextcodec.mm
@@ -80,7 +80,7 @@ QTextCodec *QTextCodec::codecForLocale()
 
 // constructors, copy constructors, and destructors ----------------------------
 
-QTextCodec::QTextCodec(int e)
+QTextCodec::QTextCodec(CFStringEncoding e)
 {
     encoding = e;
 }
diff --git a/WebCore/src/kwq/qt/qtextcodec.h b/WebCore/src/kwq/qt/qtextcodec.h
index e2b0246..af6817c 100644
--- a/WebCore/src/kwq/qt/qtextcodec.h
+++ b/WebCore/src/kwq/qt/qtextcodec.h
@@ -73,7 +73,7 @@ public:
 
     // constructors, copy constructors, and destructors ------------------------
 
-    QTextCodec(int);
+    QTextCodec(CFStringEncoding);
     ~QTextCodec();
 
     // member functions --------------------------------------------------------

-- 
WebKit Debian packaging