[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 fc7168118fbca1c3b6e7a3c028ac0e1cee13f567
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 19 14:45:37 2001 +0000

    More hacks to get the borrowed qstring to work
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@373 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQTextCodec.mm b/WebCore/kwq/KWQTextCodec.mm
index b159dac..d83c139 100644
--- a/WebCore/kwq/KWQTextCodec.mm
+++ b/WebCore/kwq/KWQTextCodec.mm
@@ -137,6 +137,32 @@ QString QTextCodec::toUnicode(const char *chs) const
 }
 
 #else // USING_BORROWED_QSTRING
-// This will help to keep the linker from complaining about empty archives
-void KWQtextcodec_Dummy() {}
+
+QTextCodec *QTextCodec::codecForMib(int)
+{
+    // FIXME: danger Will Robinson!!!
+    _logNotYetImplemented();
+    return NULL;
+}
+
+QTextCodec *QTextCodec::codecForName(const char *, int)
+{
+    // FIXME: danger Will Robinson!!!
+    _logNotYetImplemented();
+    return NULL;
+}
+
+QTextCodec *QTextCodec::codecForLocale()
+{
+    // FIXME: danger Will Robinson!!!
+    _logNotYetImplemented();
+    return NULL;
+}
+
+QCString QTextCodec::fromUnicode(const QString &qcs) const
+{
+    // FIXME: is there a more efficient way to do this?
+    return QCString(qcs.latin1());
+}
+
 #endif // USING_BORROWED_QSTRING
diff --git a/WebCore/src/kwq/KWQtextcodec.mm b/WebCore/src/kwq/KWQtextcodec.mm
index b159dac..d83c139 100644
--- a/WebCore/src/kwq/KWQtextcodec.mm
+++ b/WebCore/src/kwq/KWQtextcodec.mm
@@ -137,6 +137,32 @@ QString QTextCodec::toUnicode(const char *chs) const
 }
 
 #else // USING_BORROWED_QSTRING
-// This will help to keep the linker from complaining about empty archives
-void KWQtextcodec_Dummy() {}
+
+QTextCodec *QTextCodec::codecForMib(int)
+{
+    // FIXME: danger Will Robinson!!!
+    _logNotYetImplemented();
+    return NULL;
+}
+
+QTextCodec *QTextCodec::codecForName(const char *, int)
+{
+    // FIXME: danger Will Robinson!!!
+    _logNotYetImplemented();
+    return NULL;
+}
+
+QTextCodec *QTextCodec::codecForLocale()
+{
+    // FIXME: danger Will Robinson!!!
+    _logNotYetImplemented();
+    return NULL;
+}
+
+QCString QTextCodec::fromUnicode(const QString &qcs) const
+{
+    // FIXME: is there a more efficient way to do this?
+    return QCString(qcs.latin1());
+}
+
 #endif // USING_BORROWED_QSTRING

-- 
WebKit Debian packaging